Trunk+grunt

See #1756