bugfix after bugfix in setregistry
bugfix in hash calculation of sets
Merge branch 'master' into develop-r