Merge branch 'MDL-60077-master-fix' of https://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 1 Feb 2018 06:55:50 +0000 (14:55 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 1 Feb 2018 06:55:50 +0000 (14:55 +0800)

Trivial merge