Merge branch 'patched' into danno
authorDaniel <thefekete@gmail.com>
Sat, 29 Dec 2018 01:28:23 +0000 (02:28 +0100)
committerDaniel <thefekete@gmail.com>
Sat, 29 Dec 2018 01:28:23 +0000 (02:28 +0100)

Trivial merge