Merge branch 'MDL-56046_master-fix2' of git://github.com/markn86/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 28 Jun 2017 06:13:43 +0000 (14:13 +0800)
committerDavid Monllao <david.monllao@gmail.com>
Wed, 28 Jun 2017 16:24:48 +0000 (18:24 +0200)

Trivial merge