Merge branch 'MDL-50666-master-fix' of git://github.com/junpataleta/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 20 Dec 2017 02:57:17 +0000 (15:57 +1300)
committerJun Pataleta <jun@moodle.com>
Wed, 20 Dec 2017 02:57:17 +0000 (15:57 +1300)

Trivial merge