Bumping Gotham

A few patches that make Gotham level with Master.

thanks to fyfe.