Merge development -> development-v6 in preparation for a later development-v6 -> development -> master release chain of merges. Merging this PR should remove all existing merge conflicts on #1950
No functional changes. To me more precise: no changes at all except git bookkeeping
Related issue or feature (if applicable): N/A
Pull request in docs with documentation (if applicable): N/A
By submitting this pull request, I confirm the following:
I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
I have commented my proposed changes within the code.
I am willing to help maintain this change if there are issues with it later.
What does this implement/fix?
Merge
development -> development-v6
in preparation for a laterdevelopment-v6 -> development -> master
release chain of merges. Merging this PR should remove all existing merge conflicts on #1950No functional changes. To me more precise: no changes at all except
git
bookkeepingRelated issue or feature (if applicable): N/A
Pull request in docs with documentation (if applicable): N/A
By submitting this pull request, I confirm the following:
git rebase
)Checklist:
developmental
branch.