Merge branch 'master' into packer/runningman
authorMirio <opivy@hotmail.de>
Sun, 12 Mar 2017 01:11:29 +0000 (02:11 +0100)
committerMirio <opivy@hotmail.de>
Sun, 12 Mar 2017 01:11:29 +0000 (02:11 +0100)

Trivial merge