Updated to new upstream release 1.6.4

git-svn-id: file:///srv/repos/svn-community/svn@105598 9fca08f4-af9d-4005-b8df-a31f2cc04f65