Merge branch 'MDL-57648-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 17 Mar 2017 08:21:03 +0000 (08:21 +0000)
committerDan Poltawski <dan@moodle.com>
Fri, 17 Mar 2017 08:21:03 +0000 (08:21 +0000)

Trivial merge