Merge branch 'MDL-53293-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 11 May 2016 09:00:50 +0000 (10:00 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 11 May 2016 09:00:50 +0000 (10:00 +0100)

Trivial merge