Merged with SVN trunk rev 1848