Merge in 08 class changes.