Merge branch '1.0'