#402: Pull changes from grunt repository

Resolves #402.