Merge.
authorCarl Hetherington <cth@carlh.net>
Tue, 8 Dec 2015 12:14:16 +0000 (12:14 +0000)
committerCarl Hetherington <cth@carlh.net>
Tue, 8 Dec 2015 12:14:16 +0000 (12:14 +0000)

Trivial merge