Merge remote-tracking branch 'origin/master'
authorDavid Bremner <david@tethera.net>
Tue, 5 Jan 2016 02:18:53 +0000 (22:18 -0400)
committerDavid Bremner <david@tethera.net>
Tue, 5 Jan 2016 02:18:53 +0000 (22:18 -0400)

Trivial merge