Euca 7939

I'm honestly not sure why this includes more than just the expando/sgroup.js change.