Merge branch 'platform/emacs24.4' into dev