Merge remote-tracking branch 'origin/master'
authorDavid Bremner <david@tethera.net>
Mon, 16 Feb 2015 01:08:33 +0000 (21:08 -0400)
committerDavid Bremner <david@tethera.net>
Mon, 16 Feb 2015 01:08:33 +0000 (21:08 -0400)

Trivial merge