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