Merge branch 'MDL-59784-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 23 Aug 2017 02:47:54 +0000 (10:47 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 23 Aug 2017 02:47:54 +0000 (10:47 +0800)

Trivial merge