Merge branch 'MDL-53516-integration' of https://github.com/merrill-oakland/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 30 Mar 2016 01:10:09 +0000 (09:10 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 30 Mar 2016 01:10:09 +0000 (09:10 +0800)

Trivial merge