Merge branch 'MDL-51652-master' of https://github.com/sammarshallou/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 15 Oct 2015 12:45:10 +0000 (13:45 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 15 Oct 2015 12:45:10 +0000 (13:45 +0100)

Trivial merge