Updated with changes r256687.
added grep(1)
Missing file copied over from master