Merge commit 'schmonz/master' into cvs