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