3.0.0-wip: grunt before merge