Upgrading main server to 1.5.0