Merge emacs bug fixes from release
authorDavid Bremner <david@tethera.net>
Mon, 2 May 2016 00:11:45 +0000 (21:11 -0300)
committerDavid Bremner <david@tethera.net>
Mon, 2 May 2016 00:11:45 +0000 (21:11 -0300)

Trivial merge