Merged with latest from SVN trunk of library.