Merge branch 'MDL-58368-master' of git://github.com/damyon/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 5 Apr 2017 01:33:45 +0000 (09:33 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 5 Apr 2017 01:33:45 +0000 (09:33 +0800)

Trivial merge