Merge branch 'MDL-60796-master' of git://github.com/ankitagarwal/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 21 Nov 2017 00:18:42 +0000 (08:18 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 22 Nov 2017 12:24:30 +0000 (13:24 +0100)

Trivial merge