Merge from trunk.

svn path=/branches/hash/libs/system/; revision=39287
Merge with the offending files removed.

svn path=/branches/hash/libs/system/; revision=39995