Merge branch 'MDL-64820-master-fix' of https://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 25 Mar 2019 01:38:04 +0000 (09:38 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 25 Mar 2019 01:38:04 +0000 (09:38 +0800)

Trivial merge