Merge branch 'MDL-61012_master' of https://github.com/troywilliams/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 30 Apr 2018 09:29:25 +0000 (17:29 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 30 Apr 2018 09:29:25 +0000 (17:29 +0800)

Trivial merge