Merge branch 'MDL-57143-master' of https://github.com/LukeCarrier/moodle
authorDavid Monllao <david.monllao@gmail.com>
Mon, 19 Dec 2016 11:54:04 +0000 (12:54 +0100)
committerDavid Monllao <david.monllao@gmail.com>
Mon, 19 Dec 2016 11:54:04 +0000 (12:54 +0100)

Trivial merge