*MERGE* Merge the latest trunk enhancements into the reuse-schema branch. Fix
the reuse-schema build of the CLI so that it works again. (tags: reuse-schema)
↧