Merge branch 'MDL-66982_master' of https://github.com/nadavkav/moodle