Merge remote-tracking branch 'origin/master'
authorDavid Bremner <david@tethera.net>
Sat, 26 Sep 2015 10:43:09 +0000 (07:43 -0300)
committerDavid Bremner <david@tethera.net>
Sat, 26 Sep 2015 10:43:09 +0000 (07:43 -0300)

Trivial merge