Hand-apply c165ea8ccadf5bb8c4401a23bb2e998fabdc8a9b from master.
authorCarl Hetherington <cth@carlh.net>
Sun, 12 Apr 2015 16:35:02 +0000 (17:35 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 12 Apr 2015 16:35:02 +0000 (17:35 +0100)

No differences found