Merge remote-tracking branch 'origin' into 1.5.x