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