Merge branch '1.5-style-updates' into 1.5