Cleanup
Removed test content headers/footer entries
Merge branch 'master' into MOODLE_24_STABLE