Fixes for IE
Merge branch 'fma-dino'