Merge branch 'MDL-46513_master' of git://github.com/markn86/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 6 Jun 2018 07:59:21 +0000 (15:59 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jun 2018 09:16:34 +0000 (11:16 +0200)

Trivial merge