Commit b5212858f17f053e8854b376a2d3f134a3fbd71b

Miha 2014-03-03T11:40:22

Merge remote-tracking branch 'remotes/upstream/development' into development