latest update from SVN. 17 July