sync with SVN@6500 - copyright years updated, corrections