Merge branch 'MDL-67353_reset' of https://github.com/stronk7/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 30 Jan 2020 04:35:56 +0000 (12:35 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 30 Jan 2020 04:35:56 +0000 (12:35 +0800)

Trivial merge