support ie7
Merge remote-tracking branch 'origin/optimized'