Merge branch 'MDL-53309_master-second-attempt' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 20 Apr 2016 09:27:57 +0000 (10:27 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 20 Apr 2016 09:27:57 +0000 (10:27 +0100)

Trivial merge