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