Merge branch 'MDL-57456_master-fix' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 20 Apr 2017 04:38:05 +0000 (12:38 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 20 Apr 2017 04:38:05 +0000 (12:38 +0800)

Trivial merge