Merge branch 'MDL-56251_master-fix2' of https://github.com/markn86/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 9 May 2017 05:13:58 +0000 (13:13 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 9 May 2017 05:13:58 +0000 (13:13 +0800)

Trivial merge