Long overdue merge

I tested and confirmed that the beta, even with my landed_title changes, continues to be savegame compatible.