Merge remote-tracking branch 'origin/master'
authorDavid Bremner <david@tethera.net>
Fri, 2 Oct 2015 12:10:40 +0000 (09:10 -0300)
committerDavid Bremner <david@tethera.net>
Fri, 2 Oct 2015 12:10:40 +0000 (09:10 -0300)

Trivial merge