Merge remote-tracking branch 'origin/master'
authorDavid Bremner <david@tethera.net>
Fri, 18 Sep 2015 12:07:52 +0000 (09:07 -0300)
committerDavid Bremner <david@tethera.net>
Fri, 18 Sep 2015 12:07:52 +0000 (09:07 -0300)

Trivial merge