Merge branch 'master' into subtitle-content
authorCarl Hetherington <cth@carlh.net>
Sat, 11 Jan 2014 18:59:26 +0000 (18:59 +0000)
committerCarl Hetherington <cth@carlh.net>
Sat, 11 Jan 2014 18:59:26 +0000 (18:59 +0000)

Trivial merge