Merge branch 'MDL-51501-master' of git://github.com/merrill-oakland/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 5 Oct 2015 10:47:52 +0000 (11:47 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 5 Oct 2015 10:47:52 +0000 (11:47 +0100)

Trivial merge