Applied patch to term.el (GNU Emacs bug #15744)
Merge branch 'master' of github.com:sjolsen/emacs