Merge branch 'MDL-61950-master' of git://github.com/ryanwyllie/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 18 Apr 2018 01:46:57 +0000 (09:46 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 18 Apr 2018 01:46:57 +0000 (09:46 +0800)

Trivial merge