#308: pull changes from grunt repository

Resolves #308.