Commit changes from 0 A.D (origin)

Changes from 0 A.D (origin)