Merge branch 'master' into dev

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

@ -1 +1 @@
Subproject commit 3a33731135f1b7dd2efdb51b16158c84bb22da66
Subproject commit e3fd2b99a4f11954e508d6f24a0b592efa5f6390