further improvements to make sure names and urls are unique
Merge branch 'master' into RELEASE_20140325