Merge remote-tracking branch 'origin/master'
authorDavid Bremner <david@tethera.net>
Sun, 30 Aug 2015 00:12:44 +0000 (21:12 -0300)
committerDavid Bremner <david@tethera.net>
Sun, 30 Aug 2015 00:12:44 +0000 (21:12 -0300)

Trivial merge