Merge branch 'master_MDL-60007' of https://github.com/CengageEng/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 2 Nov 2017 00:50:42 +0000 (08:50 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 2 Nov 2017 00:50:42 +0000 (08:50 +0800)

Trivial merge