Merge branch 'hotfix/0.4.1'
Merge branch 'release/0.4.2'
Bump to v0.5
Update ChangeLog
Merge branch 'release/0.5'
Merge branch 'master' into develop