Merge pull request #1 from stenbacka/master

Sync with CVS (version: 2.9.8.3rc1)