Merge branch 'MDL-37624-master-fix' of git://github.com/junpataleta/moodle