Merge branch 'master' into staging
authorCarl Hetherington <cth@carlh.net>
Wed, 17 Apr 2013 09:41:57 +0000 (10:41 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 17 Apr 2013 09:41:57 +0000 (10:41 +0100)

Trivial merge