not using source maps; may be conflicts in IE
Merge branch 'master' into gh-pages