Merge branch 'MDL-49484-master' of github.com:jebarviabb/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 26 Jun 2017 02:51:43 +0000 (10:51 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 26 Jun 2017 02:51:43 +0000 (10:51 +0800)

Trivial merge