Merge branch 'develop' into 15.3.7-rc1 (bugfixes and trivial changes only).
authorDaniel Kochmański <dkochmanski@hellsgate.pl>
Fri, 6 Mar 2015 16:12:13 +0000 (17:12 +0100)
committerDaniel Kochmański <dkochmanski@hellsgate.pl>
Fri, 6 Mar 2015 16:12:13 +0000 (17:12 +0100)

Trivial merge