Merge remote-tracking branch 'origin/develop' into push_badge_counts

synapse/push/bulk_push_rule_evaluator.py

@@ -107,6 +107,9 @@ class BulkPushRuleEvaluator:
             if len(filtered) == 0:
                 continue
 
+            if filtered.sender == uid:
+                continue
+
             for rule in rules:
                 if 'enabled' in rule and not rule['enabled']:
                     continue