Merge branch 'MDL-55019-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Jul 2016 14:29:19 +0000 (15:29 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Jul 2016 14:29:19 +0000 (15:29 +0100)

Trivial merge