config changes merged from trunk and conflicts resolved. docs not rebuilt, however, due to doc build failures.