Trying a different fix for the random build failure
Merge remote-tracking branch 'origin/master'