Internals: misc tweaks to facilitate branch merging.
1 file changed