Disabling allow_explicit_index breaks bulk
grr, formatted by mistake...
Merge remote-tracking branch 'upstream/master'