Reformulated two strcpy() calls to resolve Coverity defect reports.
Merged the master branch into the Coverity branch.