Merge tag '0.4.15' into stable-0.4
authorsfan5 <sfan5@live.de>
Thu, 22 Dec 2016 22:00:57 +0000 (23:00 +0100)
committersfan5 <sfan5@live.de>
Thu, 22 Dec 2016 22:00:57 +0000 (23:00 +0100)
0.4.15


Trivial merge