Merge branch 'MDL-60526-master-fix1' of http://github.com/damyon/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 22 Nov 2017 03:54:18 +0000 (16:54 +1300)
committerDavid Monllao <davidm@moodle.com>
Wed, 22 Nov 2017 12:24:32 +0000 (13:24 +0100)

Trivial merge