Merge branch 'MDL-57472-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <david.monllao@gmail.com>
Wed, 28 Dec 2016 12:37:19 +0000 (13:37 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 28 Dec 2016 21:19:01 +0000 (21:19 +0000)

Trivial merge