Merge branch 'MDL-55061' of https://github.com/zanekarl17/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 8 Aug 2016 13:33:08 +0000 (14:33 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 8 Aug 2016 13:33:08 +0000 (14:33 +0100)

Trivial merge