Merge branch 'master' into develop
authorDaniel Kochmański <dkochmanski@hellsgate.pl>
Sun, 8 Mar 2015 13:05:47 +0000 (14:05 +0100)
committerDaniel Kochmański <dkochmanski@hellsgate.pl>
Sun, 8 Mar 2015 13:05:47 +0000 (14:05 +0100)

Trivial merge