Merge branch '1.5' into 1.5.7