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