avoid warnings
fix warning during build
Merge branch 'emacs20130831'