Merge branch 'MDL-51906-master-fixes' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 27 Oct 2015 10:49:10 +0000 (10:49 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 27 Oct 2015 10:49:10 +0000 (10:49 +0000)

Trivial merge