Merge branch 'MDL-63689-master-workshopprivacy' of git://github.com/mudrd8mz/moodle