Merged with SVN trunk rev 1848
Merged changes from SVN trunk rev 1848