Merge branch 'MDL-57667-master' of https://github.com/snake/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 24 Jan 2017 09:38:14 +0000 (09:38 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 24 Jan 2017 09:38:14 +0000 (09:38 +0000)

Trivial merge