Fix Issue #317
Merge branch 'master' of github.com:ergoemacs/ergoemacs-mode