Fix message ids
IE support for future theme
Merge branch 'master' into gh-pages