Restore compatibility with Emacs 24.2
Merge remote-tracking branch 'origin/master' into dev