Merge in 08 class changes.
Merge remote-tracking branch 'upstream/master'