Merge branch 'MDL-59830_master-v2' of git://github.com/markn86/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 29 Aug 2017 09:23:44 +0000 (17:23 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 29 Aug 2017 09:23:44 +0000 (17:23 +0800)

Trivial merge