Merge branch 'master' into auction
authorMarkus Teich <teichm@fs.tum.de>
Thu, 12 Jan 2017 16:34:19 +0000 (17:34 +0100)
committerMarkus Teich <teichm@fs.tum.de>
Thu, 12 Jan 2017 16:34:19 +0000 (17:34 +0100)

Trivial merge