Merge branch 'MDL-52491-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 12 Jan 2016 11:35:25 +0000 (11:35 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Jan 2016 11:35:25 +0000 (11:35 +0000)

Trivial merge