Merge branch 'notandy-master'
authorSuperBFG7 <daniel@despite.ch>
Fri, 26 Jan 2018 12:59:08 +0000 (13:59 +0100)
committerSuperBFG7 <daniel@despite.ch>
Fri, 26 Jan 2018 12:59:08 +0000 (13:59 +0100)

Trivial merge