sync up with hackage; v0.6.0.4