#308: pull changes from grunt repository
Merge pull request #309 from jeff1evesque/pull_grunt_changes

#308: pull changes from grunt repository