Merge 1.5.0 changes back to master.
Please enter a commit message to explain why this merge is necessary,