trying to resolve ie7 issue
Merge branch 'master' into pictonic
ie8 issue