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