#319: pull changes from grunt repository
Merge pull request #320 from jeff1evesque/pull_grunt_changes

#319: pull changes from grunt repository