Merge branch '1.0' into 1.0-multiple-selection
authorCarl Hetherington <cth@carlh.net>
Mon, 11 Nov 2013 21:55:23 +0000 (21:55 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 11 Nov 2013 21:55:23 +0000 (21:55 +0000)

Trivial merge