Updated to 1.5.0
Merge pull request #6659 from nakp/patch-1

Updated to 1.5.0