Merge branch 'MDL-55565-master' of https://github.com/snake/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 22 Aug 2016 13:22:38 +0000 (14:22 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 22 Aug 2016 13:22:38 +0000 (14:22 +0100)

Trivial merge