Merge branch 'MDL-50833-master' of git://github.com/merrill-oakland/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 28 Jul 2015 11:38:52 +0000 (12:38 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 28 Jul 2015 11:38:52 +0000 (12:38 +0100)

Trivial merge