Merge branch 'MDL-56836-master' of https://github.com/snake/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 6 Dec 2016 12:46:19 +0000 (12:46 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Dec 2016 12:46:19 +0000 (12:46 +0000)

Trivial merge