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