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