Merge branch 'release/0.7.3' into devel
Merge branch 'master' into devel
Bump release with whatever meyer did
Merge branch 'release/0.7.4'