Merge remote-tracking branch 'origin/master' into janis_work
authorJanis Streib <janis@dogcraft.de>
Thu, 12 May 2016 22:47:37 +0000 (00:47 +0200)
committerJanis Streib <janis@dogcraft.de>
Thu, 12 May 2016 22:47:37 +0000 (00:47 +0200)

Trivial merge