Merged tools, system, filesystem from trunk at 41106

[SVN r41109]