Merge branch 'MDL-57134-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 25 Nov 2016 12:35:17 +0000 (12:35 +0000)
committerDan Poltawski <dan@moodle.com>
Fri, 25 Nov 2016 12:35:17 +0000 (12:35 +0000)

Trivial merge