Merge branch 'master' into packer/vorix 53/head
authorMirio <opivy@hotmail.de>
Wed, 26 Oct 2016 22:35:07 +0000 (00:35 +0200)
committerMirio <opivy@hotmail.de>
Wed, 26 Oct 2016 22:35:07 +0000 (00:35 +0200)

Trivial merge