Merge branch 'MDL-50806-master' of git://github.com/merrill-oakland/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 13 Jul 2015 12:42:53 +0000 (13:42 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 13 Jul 2015 12:42:53 +0000 (13:42 +0100)

Trivial merge