Merge branch 'master' into t0uYK8Ne/finalrage 69/head
authorMirio <opivy@hotmail.de>
Fri, 10 Mar 2017 20:19:03 +0000 (21:19 +0100)
committerMirio <opivy@hotmail.de>
Fri, 10 Mar 2017 20:19:03 +0000 (21:19 +0100)

Trivial merge