Merge branch 'MDL-56300_master' of git://github.com/reskit/moodle