Merge branch 'MDL-55364-master-fix' of https://github.com/xow/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 2 Aug 2017 02:51:05 +0000 (10:51 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 2 Aug 2017 02:51:05 +0000 (10:51 +0800)

Trivial merge