Set large-file-warning-threshold to 100MB (by default it was just 10)
Merge remote-tracking branch 'upstream/master'