Merge branch '1.2'