Merge branch 'MDL-41914-weekly' of git://github.com/jleyva/moodle