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