IE9 Compatability
Merge from master
Regen after merge