Merge branch 'hotfix-all'
Changelog added

Signed-off-by: Peter Legierski <peter@legierski.net>
Merge branch 'hotfix-changelog' into develop