Merge branch 'MDL-39029' of git://github.com/jacks92/moodle