Merge branch 'R41z-master'
authorAaron Marcher <info@nulltime.net>
Fri, 9 Sep 2016 17:07:25 +0000 (19:07 +0200)
committerAaron Marcher (drkhsh) <info@nulltime.net>
Fri, 9 Sep 2016 17:07:25 +0000 (19:07 +0200)

Trivial merge