Merge branch 'MDL-28015-workshop-sql' of git://github.com/mudrd8mz/moodle