Merge branch 'MDL-58539_master' of https://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 18 Apr 2017 00:41:59 +0000 (08:41 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 18 Apr 2017 00:41:59 +0000 (08:41 +0800)

Trivial merge