Merge branch 'develop' into experimental experimental origin/experimental
authorDaniel Kochmański <jackdaniel@hellsgate.pl>
Sun, 12 Apr 2015 09:54:18 +0000 (11:54 +0200)
committerDaniel Kochmański <jackdaniel@hellsgate.pl>
Sun, 12 Apr 2015 09:54:18 +0000 (11:54 +0200)

Trivial merge