[ASFCS40] 4.0 branch is now up to date...

[Alex Huang]

All changes from master has been merged to the 4.0 branch.  Starting from here, 
I will merge changes from master on a daily basis.

--Alex