Merge branch 'master' into packer/vorix
authorMirio <opivy@hotmail.de>
Tue, 25 Oct 2016 22:34:40 +0000 (00:34 +0200)
committerMirio <opivy@hotmail.de>
Tue, 25 Oct 2016 22:34:40 +0000 (00:34 +0200)

Trivial merge