Hotfix for Emacs wiki down and key-chord issue
Merge branch 'develop' (v0.35.1)