Merge 1.3.x into master