Merge branch 'MDL-55575_B' of https://github.com/bostelm/moodle
authorDavid Monllao <david.monllao@gmail.com>
Mon, 19 Dec 2016 13:59:13 +0000 (14:59 +0100)
committerDavid Monllao <david.monllao@gmail.com>
Mon, 19 Dec 2016 13:59:13 +0000 (14:59 +0100)

Trivial merge