$ 0 0 *MERGE* Merge recent trunk fixes and enhancements into the alter-table-constraints branch. (tags: alter-table-constraints)