Merge branch 'MDL-67126_master' of https://github.com/ffhs/moodle