for deploy
Merge branch '1.2beta'