Merge branch 'master' into neil
authorNeil Smith <neil.github@njae.me.uk>
Mon, 25 Nov 2013 17:37:10 +0000 (17:37 +0000)
committerNeil Smith <neil.github@njae.me.uk>
Mon, 25 Nov 2013 17:37:10 +0000 (17:37 +0000)

Trivial merge