Merge some of the 1.5 branch fixes.