Merge branch 'dev' into master

Author: EvanLovely

composer.json

@@ -30,7 +30,7 @@
 	"extra": {
 		"patternlab": {
 			"config": {
-				"lineageMatch": "{%([ ]+)?include( |\\()["\\']([A-Za-z0-9-_]+)["\\'](\\))?(.*)%}",
+				"lineageMatch": "{%([ ]+)?(?:include|extends|embed)( |\\()["\\']([\\/.@A-Za-z0-9-_]+)["\\']([\\s\\S+]*?)%}",
 				"lineageMatchKey": 3,
 				"patternExtension": "twig",
 				"twigDebug": false,