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