Merge remote-tracking branch 'upstream/master' into 1.7.x-merge