Merge branch 'release-0.10'
authorAndrew Ruthven <andrew@etc.gen.nz>
Thu, 4 Dec 2014 21:19:03 +0000 (10:19 +1300)
committerAndrew Ruthven <andrew@etc.gen.nz>
Thu, 4 Dec 2014 21:19:03 +0000 (10:19 +1300)

Trivial merge