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