Merge branch 'master_MDL-49417' of https://github.com/danmarsden/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 12 Mar 2018 03:34:13 +0000 (11:34 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 12 Mar 2018 03:34:13 +0000 (11:34 +0800)

Trivial merge