Merge branch 'MDL-59936-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 30 Oct 2017 01:34:58 +0000 (14:34 +1300)
committerJun Pataleta <jun@moodle.com>
Mon, 30 Oct 2017 01:34:58 +0000 (14:34 +1300)

Trivial merge