Merge branch 'MDL-59940-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 27 Sep 2017 04:56:56 +0000 (12:56 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 27 Sep 2017 04:56:56 +0000 (12:56 +0800)

Trivial merge