Preserve all contribution changes and incorporate main fb06eab03f. Only the four independent #1447 files differ from the previously validated tree; the shared regression file passed 11 tests.
fb06eab03f