re #7343 sorting out pointless merge conflicts
Merge branch 'bugfix/7344_createworkspace_wiki_example' into develop