Merge branch 'MDL-57512-master' of git://github.com/crazyserver/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 29 Dec 2016 11:50:50 +0000 (11:50 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 29 Dec 2016 11:50:50 +0000 (11:50 +0000)

Trivial merge