Merge master.
authorCarl Hetherington <cth@carlh.net>
Tue, 25 Feb 2014 17:39:25 +0000 (17:39 +0000)
committerCarl Hetherington <cth@carlh.net>
Tue, 25 Feb 2014 17:39:25 +0000 (17:39 +0000)

Trivial merge