Merge branch 'master' into dev

This commit is contained in:
Kwoth
2016-07-30 15:19:44 +02:00