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