Merge branch 'MDL-36941_master' of git://github.com/markn86/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 23 Mar 2018 04:55:49 +0000 (12:55 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 23 Mar 2018 04:55:49 +0000 (12:55 +0800)

Trivial merge