Merged trunk changes for release 3.8.8 (i.e. r1284 to r1299) into the v4-dev branch.
Resolved conflicts:
* missing Doc/Design/ConfigFileStructure.odt by in v4-dev is correct - the file has been deleted and its information moved to Docs/FileFormats/config.html
* VCodeSnip.vi: rejected changes in trunk and kept version in this branch.
Some files are physically unchanged and have changes only to their svn:mergeinfo property.