Merge branch 'MDL-41528_master' of https://github.com/nitzo/moodle