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