Merge branch 'MDL-37190-master' of https://github.com/lucaboesch/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 30 Jan 2018 04:02:37 +0000 (12:02 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 1 Feb 2018 02:33:17 +0000 (10:33 +0800)

Trivial merge