Merge branch 'MDL-60700-master-fix' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 8 Nov 2017 02:17:25 +0000 (15:17 +1300)
committerJun Pataleta <jun@moodle.com>
Wed, 8 Nov 2017 02:17:25 +0000 (15:17 +1300)

Trivial merge