Merge branch 'MDL-60753_master' of git://github.com/markn86/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 9 Nov 2017 06:47:23 +0000 (14:47 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 9 Nov 2017 06:47:23 +0000 (14:47 +0800)

Trivial merge