#315: Pull changes from grunt repository

Resolves #315.