Merge branch 'MDL-60830-master' of git://github.com/sarjona/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 27 Nov 2017 02:29:55 +0000 (10:29 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 27 Nov 2017 02:29:55 +0000 (10:29 +0800)

Trivial merge