Merge branch 'MDL-57411-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 5 Apr 2017 11:44:03 +0000 (12:44 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 5 Apr 2017 11:44:03 +0000 (12:44 +0100)

Trivial merge