Merge branch 'master' into interop
authorCarl Hetherington <cth@carlh.net>
Sun, 25 Aug 2013 12:22:32 +0000 (13:22 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 25 Aug 2013 12:22:32 +0000 (13:22 +0100)

Trivial merge