#319: pull changes from grunt repository

Resolves #319.