Merge branch 'MDL-36680_hidden_23' of git://github.com/andyjdavis/moodle into MOODLE_...