Merge pull request #6304 from mikeller/update_versions_after_3_4_0