Merge.
authorCarl Hetherington <cth@carlh.net>
Fri, 5 Feb 2016 15:55:33 +0000 (15:55 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 5 Feb 2016 15:55:33 +0000 (15:55 +0000)

Trivial merge