Release 0.4.0 see ChangeLog for details
Merge branch 'release/0.4.0'