Merge remote-tracking branch 'upstream/master'

This merges 1.5.0-PRE