Merge branch 'MDL-41646' of git://github.com/apsdehal/moodle