Merge remote-tracking branch 'origin/master' into 4_7_x