Merge branch 'MDL-57480-master' of https://github.com/snake/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 10 Jan 2017 08:40:10 +0000 (08:40 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 10 Jan 2017 08:40:10 +0000 (08:40 +0000)

Trivial merge