Merge "Merge branch release-2018"
authorBerk Hess <hess@kth.se>
Fri, 24 Aug 2018 15:44:02 +0000 (17:44 +0200)
committerBerk Hess <hess@kth.se>
Fri, 24 Aug 2018 15:44:02 +0000 (17:44 +0200)

Trivial merge