Merged revision(s) 2480-2542 from tags/version-4.0.1:
Updates code base for portable branch from v4.0.0 to v4.0.1.
This branch's root directory has svn:mergeinfo properties changed. Build.html and ChangeLog-v3.txt have svn:merginfo properties changes as well as text changed.