Merge branch 'master' into scenario-outline-with-slashes

# Conflicts:
#	CHANGES.rst

Author: jsa34

CHANGES.rst

@@ -12,6 +12,7 @@ Unreleased
 - Multiline steps must now always use triple-quotes for the additional lines.
 - All feature files must now use the keyword `Feature:` to be considered valid.
 - Tags can no longer have spaces (e.g. "@tag one" and "@tag two" are no longer valid).
+- Tags can now be on multiple lines (stacked)
 
 7.3.0
 ----------

tests/feature/test_tags.py

@@ -2,8 +2,6 @@
 
 import textwrap
 
-import pytest
-
 
 def test_tags_selector(pytester):
     """Test tests selection by tags."""
@@ -191,3 +189,40 @@ def _():
     strict_option = "--strict-markers"
     result = pytester.runpytest_subprocess(strict_option)
     result.stdout.fnmatch_lines(["*= 2 passed * =*"])
+
+
+def test_multiline_tags(pytester):
+    pytester.makefile(
+        ".feature",
+        test="""
+    Feature: Scenario with tags over multiple lines
+
+        @tag1
+        @tag2
+        Scenario: Tags
+            Given I have a foo
+
+        Scenario: Second
+            Given I have a baz
+    """,
+    )
+    pytester.makepyfile(
+        """
+        from pytest_bdd import given, scenarios
+
+        @given('I have a foo')
+        def _():
+            pass
+
+        @given('I have a baz')
+        def _():
+            pass
+
+        scenarios('test.feature')
+    """
+    )
+    result = pytester.runpytest("-m", "tag1", "-vv")
+    result.assert_outcomes(passed=1, deselected=1)
+
+    result = pytester.runpytest("-m", "tag2", "-vv")
+    result.assert_outcomes(passed=1, deselected=1)