Merge branch 'hotfix/apidoc'
Added rewrites for security announcements

- Messed up links in the changelog; rewrites will get there
Merge branch 'hotfix/security-rewrites-2-1-4' into develop