wordwrap #4397
Prevent settings loading twice
version compare needs this to function
Correct do_action arguments fix for #4359

Reverts db9d3ff0b796051b1b2629442681f99ae2493612 partially
Merge remote-tracking branch 'upstream/master'