7.x 3.x classics

Hi Shea,

Will you please take a look at this. It's curious. There seem to be changes that I didn't make...
Also, I updated the changelog, but I didn't quite know what to put for the tag since I'm not creating a tag. How does that work?
CLASSICS-62

Caryl