Merge branch 'MDL-56549-master' of https://github.com/kabalin/moodle