Merge remote-tracking branch 'origin/master'
authorMarkus Teich <teichm@fs.tum.de>
Thu, 12 Jan 2017 17:13:17 +0000 (18:13 +0100)
committerMarkus Teich <teichm@fs.tum.de>
Thu, 12 Jan 2017 17:13:17 +0000 (18:13 +0100)

Trivial merge