Merge branch 'MDL-60708-master' of git://github.com/jleyva/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 20 Nov 2017 09:54:56 +0000 (17:54 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 20 Nov 2017 09:54:56 +0000 (17:54 +0800)

Trivial merge