Mars game staging

Merge the changes we made last week back into the mainline.