update from svn. rev r1659; imdb fixes and something else