Adding fix for IE7 layout problem
Merge branch 'master' into staging