Merge branch 'MDL-36404-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 18 Jan 2016 10:24:04 +0000 (10:24 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 18 Jan 2016 10:24:04 +0000 (10:24 +0000)

Trivial merge