Main trunk changes merged into BRANCH_engine. There were no

conflicts, which is a good thing.  Propper tagging of merge point
done.