Merge branch 'MDL-55190-master' of git://github.com/merrill-oakland/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 18 Jul 2016 13:21:03 +0000 (14:21 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 18 Jul 2016 13:21:03 +0000 (14:21 +0100)

Trivial merge