Merge branch 'MDL-54104-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 28 Jun 2016 13:31:45 +0000 (14:31 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 30 Jun 2016 08:24:57 +0000 (09:24 +0100)

Trivial merge