Merge branch 'MDL-61764_master' of git://github.com/markn86/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 24 Apr 2018 01:54:16 +0000 (09:54 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 24 Apr 2018 01:54:16 +0000 (09:54 +0800)

Trivial merge