Bug 1210556 and 1209328 add spouse to family