#281: Pull changes from grunt repository

Resolves #281.