Merge branch '1.0' into 1.0-multiple-selection
authorCarl Hetherington <cth@carlh.net>
Thu, 14 Nov 2013 11:49:13 +0000 (11:49 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 14 Nov 2013 11:49:13 +0000 (11:49 +0000)

Trivial merge