Merge 0.4.13 changes into stable-0.4
authorest31 <MTest31@outlook.com>
Thu, 20 Aug 2015 19:01:44 +0000 (21:01 +0200)
committerest31 <MTest31@outlook.com>
Thu, 20 Aug 2015 19:02:42 +0000 (21:02 +0200)
0.4.13 release!


Trivial merge