Merge branch 'master' into coverity_scan
authorKim Kulling <kim.kulling@googlemail.com>
Mon, 21 Nov 2016 09:18:17 +0000 (10:18 +0100)
committerKim Kulling <kim.kulling@googlemail.com>
Mon, 21 Nov 2016 09:18:17 +0000 (10:18 +0100)

Trivial merge