Merge branch 'MDL-41531-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 11 Jan 2016 11:08:25 +0000 (11:08 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 11 Jan 2016 11:08:25 +0000 (11:08 +0000)

Trivial merge