Merge branch 'MDL-55083_master' of https://github.com/tunele/moodle