Merge of edge factory_girl with h-lame's callbacks.