Merge branch 'MDL-65008_master' of https://github.com/dvdcastro/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 27 Mar 2019 02:41:06 +0000 (10:41 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 27 Mar 2019 02:41:06 +0000 (10:41 +0800)

Trivial merge