Merge branch 'MDL-59365-master-fix2' of http://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 13 Jul 2017 05:04:08 +0000 (13:04 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 13 Jul 2017 05:04:08 +0000 (13:04 +0800)

Trivial merge