Merge remote-tracking branch 'origin/master'
authorDavid Edmondson <dme@dme.org>
Tue, 9 Feb 2016 12:25:09 +0000 (12:25 +0000)
committerDavid Edmondson <dme@dme.org>
Tue, 9 Feb 2016 12:25:09 +0000 (12:25 +0000)

Trivial merge