Merge branch 'MDL-57250_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 13 Dec 2016 10:25:07 +0000 (10:25 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 13 Dec 2016 10:25:07 +0000 (10:25 +0000)

Trivial merge