Trunk is now a fork of the main redis trunk