Merge remote-tracking branch 'upstream/master' into X-highlight