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