Merge branch 'MDL-36606-master' of git://github.com/merrill-oakland/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 12 Oct 2015 11:41:03 +0000 (12:41 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 12 Oct 2015 11:41:03 +0000 (12:41 +0100)

Trivial merge