[add:] more words like Ackland et al
[git:] merge from github
[add:] elisa et al
[fix:] $emacsexe corrected