Merge branch 'master' into windows-debug
authorCarl Hetherington <cth@carlh.net>
Mon, 6 Jan 2014 11:07:20 +0000 (11:07 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 6 Jan 2014 11:07:20 +0000 (11:07 +0000)

Trivial merge