Merge branch 'MDL-58636-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 21 Apr 2017 03:37:57 +0000 (11:37 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 21 Apr 2017 03:37:57 +0000 (11:37 +0800)

Trivial merge