Merge css3 branch to master