-upload changes from Sourceforge-Repository (r1594-r1595)