Merge branch 'MDL-55323-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 1 Aug 2016 12:58:20 +0000 (13:58 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 1 Aug 2016 12:58:20 +0000 (13:58 +0100)

Trivial merge