Fixed broken changelog
Merge branch 'packaging'