Merge branch 'master' into developer

This commit is contained in:
Aurora 2016-04-28 00:44:01 +02:00
commit 9c12496b30