Merge branch 'develop' into mode-actions-1639

Conflicts:
  CHANGELOG.md
  docs/privacy-and-security.md
  jrnl/controller.py
  tests/bdd/features/change_time.feature

tests/unit/test_parse_args.py

@@ -23,6 +23,8 @@ def expected_args(**kwargs):
         "change_time": None,
         "edit": False,
         "end_date": None,
+        "exclude_starred": False,
+        "exclude_tagged": False,
         "today_in_history": False,
         "month": None,
         "day": None,
@@ -38,6 +40,7 @@ def expected_args(**kwargs):
         "starred": False,
         "start_date": None,
         "strict": False,
+        "tagged": False,
         "tags": False,
         "text": [],
         "config_override": [],