Fix some IE... because, IE.
Merge branch 'master' into production