Merge remote-tracking branch 'origin/master'
authorDavid Edmondson <dme@dme.org>
Wed, 7 May 2014 13:43:10 +0000 (14:43 +0100)
committerDavid Edmondson <dme@dme.org>
Wed, 7 May 2014 13:43:10 +0000 (14:43 +0100)

Trivial merge