Merge branch 'MDL-59307_master' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Jul 2017 02:12:02 +0000 (10:12 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Jul 2017 02:12:02 +0000 (10:12 +0800)

Trivial merge