Merge branch 'MDL-57194-master' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 1 Dec 2016 12:20:01 +0000 (12:20 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 1 Dec 2016 12:20:01 +0000 (12:20 +0000)

Trivial merge