Fixes a bug in IE 8
Merge branch 'production' into staging