Merge branch 'master' into 1.0-seek
authorCarl Hetherington <cth@carlh.net>
Fri, 3 Jan 2014 17:32:01 +0000 (17:32 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 3 Jan 2014 17:32:01 +0000 (17:32 +0000)

Trivial merge