Merge remote-tracking branch 'origin/master'
authorDavid Bremner <david@tethera.net>
Sun, 22 Mar 2015 16:11:30 +0000 (12:11 -0400)
committerDavid Bremner <david@tethera.net>
Sun, 22 Mar 2015 16:11:30 +0000 (12:11 -0400)

Trivial merge