Merge branch 'wip-MDL-60546-master' of git://github.com/abgreeve/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 22 Nov 2017 07:28:11 +0000 (20:28 +1300)
committerDavid Monllao <davidm@moodle.com>
Wed, 22 Nov 2017 12:24:33 +0000 (13:24 +0100)

Trivial merge