changes from #1 removed on svn-to-git, re-merged