merge from warmdarn