Merge remote-tracking branch 'origin/master' into terminology-rieks

# Conflicts:
#	docs/functional-architecture.md
#	docs/terminology-plugin-instructions.md
#	docs/terms/assertion.md
#	docs/terms/business-transaction.md
#	docs/terms/credential.md
#	docs/terms/pattern-jurisdiction.md
#	docs/terms/pattern-party-actor-action.md
#	plugins/terminology-parser/index.js
1 job for terminology-rieks in 2 minutes and 42 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #45868
build

00:02:42