Merge branch 'MDL-46236' of git://github.com/nobelium/moodle