fix chrome 32
fix chrome 32
fix chrome 32
fix chrome 32
Merge branch '2.5' into 2.x