Merge branch 'MDL-35913-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 3 May 2017 13:15:11 +0000 (14:15 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 3 May 2017 13:15:11 +0000 (14:15 +0100)

Trivial merge