Merge branch '1.5'