Merge branch 'MDL-27230-master' of https://github.com/lucaboesch/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 27 Nov 2017 01:43:44 +0000 (09:43 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 27 Nov 2017 01:43:44 +0000 (09:43 +0800)

Trivial merge