Merge "Merge branch release-2016 into release-2018" into release-2018
authorBerk Hess <hess@kth.se>
Mon, 4 Dec 2017 12:38:52 +0000 (13:38 +0100)
committerBerk Hess <hess@kth.se>
Mon, 4 Dec 2017 12:38:52 +0000 (13:38 +0100)

Trivial merge