Merge.
authorCarl Hetherington <cth@carlh.net>
Mon, 8 Jun 2015 23:30:08 +0000 (00:30 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 8 Jun 2015 23:30:08 +0000 (00:30 +0100)

Trivial merge