Merge branch 'MDL-61514-master' of git://github.com/rezaies/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 22 Mar 2018 02:52:53 +0000 (10:52 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 22 Mar 2018 02:52:53 +0000 (10:52 +0800)

Trivial merge