Merge branch 'MDL-36680_hidden' of git://github.com/andyjdavis/moodle