Merge branch 'MDL-36056-master-fix1' of http://github.com/damyon/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 5 Dec 2017 02:47:16 +0000 (15:47 +1300)
committerJun Pataleta <jun@moodle.com>
Wed, 6 Dec 2017 06:53:31 +0000 (19:53 +1300)

Trivial merge