Merged master_old into master
authorChristian Femers <femers@in.tum.de>
Mon, 20 May 2019 16:54:13 +0000 (18:54 +0200)
committerChristian Femers <femers@in.tum.de>
Mon, 20 May 2019 16:54:13 +0000 (18:54 +0200)

Trivial merge