Merge branch 'master' into Mirio/silentsiege
authorMirio <opivy@hotmail.de>
Tue, 25 Oct 2016 22:27:58 +0000 (00:27 +0200)
committerMirio <opivy@hotmail.de>
Tue, 25 Oct 2016 22:27:58 +0000 (00:27 +0200)

Trivial merge