Auto complete!
Merge branch 'master' of github.com:501st-alpha1/emacs

Forgot to pull before making changes. :o