Merge remote-tracking branch 'origin/master'
authorDavid Bremner <david@tethera.net>
Thu, 27 Aug 2015 11:34:22 +0000 (08:34 -0300)
committerDavid Bremner <david@tethera.net>
Thu, 27 Aug 2015 11:34:22 +0000 (08:34 -0300)

Trivial merge