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