initial branch commit
Merge branch 'master' into add-xedit-to-workshops