Updated

Change-Id: Ib07225e8a64b6a62989291a813caa5a7b10a33b8
Merge branch 'master' of github.com:ptorpman/emacs