Fix merge.
authorCarl Hetherington <cth@carlh.net>
Wed, 9 Nov 2016 15:30:32 +0000 (15:30 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 9 Nov 2016 15:30:32 +0000 (15:30 +0000)

Trivial merge