Merge branch 'MDL-55459-master' of https://github.com/lucisgit/moodle
authorDavid Monllao <david.monllao@gmail.com>
Mon, 3 Apr 2017 14:27:26 +0000 (16:27 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Mon, 3 Apr 2017 14:27:26 +0000 (16:27 +0200)

Trivial merge