Merge.
authorCarl Hetherington <cth@carlh.net>
Thu, 3 Sep 2015 08:35:49 +0000 (09:35 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 3 Sep 2015 08:35:49 +0000 (09:35 +0100)

Trivial merge