Merge branch 'MDL-60555-master' of https://github.com/sammarshallou/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 2 Nov 2017 02:40:43 +0000 (10:40 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 2 Nov 2017 02:40:43 +0000 (10:40 +0800)

Trivial merge