Merge branch 'MDL-60072-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 20 Oct 2017 03:49:54 +0000 (16:49 +1300)
committerJun Pataleta <jun@moodle.com>
Fri, 20 Oct 2017 03:49:54 +0000 (16:49 +1300)

Trivial merge