Merge branch 'MDL-61363-int-master' of git://github.com/ryanwyllie/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 7 Mar 2018 02:55:01 +0000 (10:55 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 7 Mar 2018 02:55:01 +0000 (10:55 +0800)

Trivial merge