$ 0 0 *MERGE* Merge trunk into mac-build-fixes branch and resolve a doc-only merge conflict. (tags: mac-build-fixes)