r580: preparing for release of 3.0.4