Merge remote-tracking branch 'origin/master'
authorDavid Bremner <david@tethera.net>
Fri, 15 Jan 2016 02:36:29 +0000 (22:36 -0400)
committerDavid Bremner <david@tethera.net>
Fri, 15 Jan 2016 02:36:29 +0000 (22:36 -0400)

Trivial merge