Merge branch 'MDL-51900_master' of https://github.com/jinhofer/moodle