Merge branch 'MDL-66391-master' of https://bitbucket.org/isprynt/moodle