Merge to my version of the civcraft site.