Merge with raduprv/Eternal-Lands.git