Merge branch 'MDL-52904-37' of git://github.com/junpataleta/moodle into MOODLE_37_STABLE