Merge branch 'MDL-50293_master' of https://github.com/Syxton/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 21 Jul 2015 11:51:46 +0000 (12:51 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 21 Jul 2015 11:51:46 +0000 (12:51 +0100)

Trivial merge