Merge branch 'wip-MDL-45068-master-fix' of https://github.com/marinaglancy/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 29 Nov 2017 03:59:25 +0000 (16:59 +1300)
committerJun Pataleta <jun@moodle.com>
Wed, 29 Nov 2017 03:59:25 +0000 (16:59 +1300)

Trivial merge