Merge branch 'release'
authorDavid Bremner <david@tethera.net>
Sat, 13 May 2017 11:51:10 +0000 (08:51 -0300)
committerDavid Bremner <david@tethera.net>
Sat, 13 May 2017 11:51:10 +0000 (08:51 -0300)
Emacs bug fix from Mark


Trivial merge