Merge branch 'MDL-49040-master' of https://github.com/jebarviabb/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 30 May 2017 10:42:23 +0000 (11:42 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 30 May 2017 10:42:23 +0000 (11:42 +0100)

Trivial merge