Merge branch '1.3.x' into 1.4.x