Version bump and changelog updates
Merge branch 'hotfix/0.4.2-1'