Don't use cl-lib in init-locales (see #117)
Remove dangling reference to desktop-save-mode
Don't use frame-restore in Emacs HEAD
Merge remote-tracking branch 'origin/master'