[AMOS commit] Merge branch 'MDL-61716-master' of git://github.com/mastnym/moodle Committed into Git: 2018-04-18 15:39 UTC