Fix wrong link
Merge branch 'version3.4' into version3.5