Merged with SVN trunk rev 1852