Merged with SVN rev 1717 for latest updates.