Merging buzzdecafe's "contains and uniq" changes