Merge branch 'MDL-58966-master' of git://github.com/danpoltawski/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 22 May 2017 02:47:31 +0000 (10:47 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 22 May 2017 02:47:31 +0000 (10:47 +0800)

Trivial merge