Merge branch 'release-0.10'
authorAndrew Ruthven <andrew@etc.gen.nz>
Mon, 28 Oct 2013 10:17:33 +0000 (23:17 +1300)
committerAndrew Ruthven <andrew@etc.gen.nz>
Mon, 28 Oct 2013 10:17:33 +0000 (23:17 +1300)

Trivial merge