tomsommer wants to merge 1 commit into ghostery:master from tomsommer:patch-1