Merge branch 'MDL-60831-master' of git://github.com/ankitagarwal/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 22 Nov 2017 07:36:45 +0000 (15:36 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 22 Nov 2017 12:24:34 +0000 (13:24 +0100)

Trivial merge