Merge branch 'master' into staging
authorCarl Hetherington <cth@carlh.net>
Thu, 18 Apr 2013 22:23:37 +0000 (23:23 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 18 Apr 2013 22:23:37 +0000 (23:23 +0100)

Trivial merge