Merge branch 'MDL-56646-master-fix' of https://github.com/xow/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 31 Aug 2017 07:00:08 +0000 (15:00 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 31 Aug 2017 07:00:08 +0000 (15:00 +0800)

Trivial merge