Merge base master into my master.

Getting the latest goodness from base master branch.