Merge branch 'MDL-58770' of https://github.com/IMSGlobal/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 16 May 2017 01:57:05 +0000 (09:57 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 16 May 2017 01:57:05 +0000 (09:57 +0800)

Trivial merge