Merge branch '1.5-branch'