Merge branch 'MDL-61521-master' of git://github.com/jleyva/moodle