Merge branch 'MDL-59475-master-cas' of git://github.com/lameze/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 17 Jul 2017 13:18:21 +0000 (14:18 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 17 Jul 2017 13:18:21 +0000 (14:18 +0100)

Trivial merge