Merge branch 'MDL-60762-master' of git://github.com/junpataleta/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 27 Mar 2018 07:47:58 +0000 (15:47 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Mar 2018 16:16:12 +0000 (18:16 +0200)

Trivial merge