$ 0 0 *MERGE* Merge the latest trunk enhancements and fixes into the commit-and-begin branch. (tags: commit-and-begin)