Merge branch '7.0'

.github/pull_request_template.md

@@ -1,9 +1,9 @@
 | Question           | Answer
 | ------------------ | ------------------
 | **JIRA issue**     | [EZP-XXXXX](https://jira.ez.no/browse/EZP-XXXXX)
-| **Bug fix**        | yes/no
+| **Bug/Improvement**| yes/no
 | **New feature**    | yes/no
-| **Target version** | `6.7`/`6.13` for bug fixes, `7.x` for features
+| **Target version** | `6.x`/`7.x` for bug fixes or improvements _(on existing features)_, `master` for features
 | **BC breaks**      | yes/no
 | **Tests pass**     | yes/no
 | **Doc needed**     | yes/no