Merge branch 'MDL-52895-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 9 Feb 2016 09:43:21 +0000 (09:43 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 9 Feb 2016 09:43:21 +0000 (09:43 +0000)

Trivial merge