Merge branch 'master' into staging
authorCarl Hetherington <cth@carlh.net>
Thu, 4 Jul 2013 21:42:33 +0000 (22:42 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 4 Jul 2013 21:42:33 +0000 (22:42 +0100)

Trivial merge