Merge branch 'MDL-60951-master' of git://github.com/damyon/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 7 Dec 2017 04:33:41 +0000 (17:33 +1300)
committerJun Pataleta <jun@moodle.com>
Thu, 7 Dec 2017 04:33:41 +0000 (17:33 +1300)

Trivial merge