Merge 0.4.15 changes into stable-0.4
authorest31 <MTest31@outlook.com>
Thu, 22 Dec 2016 22:16:00 +0000 (23:16 +0100)
committerest31 <MTest31@outlook.com>
Thu, 22 Dec 2016 22:16:00 +0000 (23:16 +0100)
0.4.15 release!


Trivial merge