Merge branch 'MDL-36606-master' of git://github.com/merrill-oakland/moodle