Merge branch 'MDL-54945-master-workshopportfolio' of git://github.com/mudrd8mz/moodle