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