Merge branch 'MDL-52098_master' of git://github.com/Chocolate-lightning/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 19 Dec 2016 11:25:47 +0000 (11:25 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 19 Dec 2016 11:25:47 +0000 (11:25 +0000)

Trivial merge