Merge branch 'MDL-53613-master' of git://github.com/merrill-oakland/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 11 Apr 2016 14:14:59 +0000 (15:14 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 11 Apr 2016 14:14:59 +0000 (15:14 +0100)

Trivial merge