Merge v. 1.5-0 into master