Merge branch 'MT2016-11-14'
authorBernhard Tittelbach <bernhard@tittelbach.org>
Thu, 17 Nov 2016 16:14:34 +0000 (17:14 +0100)
committerBernhard Tittelbach <bernhard@tittelbach.org>
Thu, 17 Nov 2016 16:18:04 +0000 (17:18 +0100)

Trivial merge