Merge branch 'MDL-59396_master-fix' of github.com:markn86/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 6 Jul 2017 03:54:48 +0000 (11:54 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 6 Jul 2017 03:54:48 +0000 (11:54 +0800)

Trivial merge