Merge branch 'MDL-51563-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 15 Oct 2015 12:50:10 +0000 (13:50 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 15 Oct 2015 12:50:10 +0000 (13:50 +0100)

Trivial merge