ignore dirty in module
ignore dirty in module
Merge branch 'master' into emacs24