Merge mxe branch.
authorCarl Hetherington <cth@carlh.net>
Mon, 24 Jul 2017 23:45:16 +0000 (00:45 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 24 Jul 2017 23:45:16 +0000 (00:45 +0100)

Trivial merge