Batch update / search+replace doesn't match multi-byte wildcards correctly
Attempt to reset timeout limit during upgrade
Merge remote-tracking branch 'upstream/master'