Merge daurnimator->trunk