Merge branch 'hotfix-2.3.31' into develop
Merge branch 'hotfix-2.3.32' into develop
STIX export now correctly uses a custom namespace instead of the default "example", fixes #301
Merge branch 'hotfix-2.3.33'