Merge remote-tracking branch 'kevin/issue/remove-primary-contacts' into features_prs/develop-next

include/class.organization.php

@@ -453,6 +453,12 @@ implements TemplateVariable, Searchable {
                 $u->setPrimaryContact(array_search($u->id, $vars['contacts']) !== false);
                 $u->save();
             }
+        } else {
+            $members = $this->allMembers();
+            $members->update(array(
+                'status' => SqlExpression::bitand(
+                    new SqlField('status'), ~User::PRIMARY_ORG_CONTACT)
+                ));
         }
 
         return $this->save();