Merge branch 'MDL-61894-master' of https://github.com/lucaboesch/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 19 Jun 2018 09:57:31 +0000 (17:57 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 19 Jun 2018 09:57:31 +0000 (17:57 +0800)

Trivial merge