Preparing to merge with moodle code. Need to commit