Merge branch 'MDL-60646-master' of git://github.com/junpataleta/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 29 Jan 2018 10:27:03 +0000 (11:27 +0100)
committerJake Dallimore <jake@moodle.com>
Thu, 1 Feb 2018 02:33:16 +0000 (10:33 +0800)

Trivial merge