Merge branch 'florianbeer-patch-1'
authorSebastian Wagner <sebix@sebix.at>
Tue, 13 Dec 2016 17:54:02 +0000 (18:54 +0100)
committerSebastian Wagner <sebix@sebix.at>
Tue, 13 Dec 2016 17:54:02 +0000 (18:54 +0100)

Trivial merge