#319: pull changes from grunt repository