Term colors for TTY frames in 24.3+
Merge branch 'master' of github.com:sjolsen/emacs