I prefer incrementing the version in the master branch after the changelog is updated and before tagging. In this case this branch is coming together in a way that I've not seen demands a v0.4.0, so let's discuss version once this is merged.