Merge branch 'MDL-60125-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 18 Sep 2017 03:49:30 +0000 (11:49 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 18 Sep 2017 03:49:30 +0000 (11:49 +0800)

Trivial merge