Merge branch 'MDL-57665_master' of git://github.com/dmonllao/moodle
authorDavid Monllao <david.monllao@gmail.com>
Mon, 20 Mar 2017 10:25:09 +0000 (11:25 +0100)
committerDavid Monllao <david.monllao@gmail.com>
Mon, 20 Mar 2017 10:25:09 +0000 (11:25 +0100)

Trivial merge