Merge branch '1.0' into 1.0-seek
authorCarl Hetherington <cth@carlh.net>
Wed, 1 Jan 2014 18:17:59 +0000 (18:17 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 1 Jan 2014 18:17:59 +0000 (18:17 +0000)

Trivial merge