Merge branch 'MDL-57394-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 30 Jan 2018 16:57:59 +0000 (17:57 +0100)
committerJake Dallimore <jake@moodle.com>
Thu, 1 Feb 2018 02:33:17 +0000 (10:33 +0800)

Trivial merge