Don't use pre
Merge remote-tracking branch 'upstream/master'