Merge branch 'master' into release-3.6

Merge branch 'master' into release-3.6

Version set to 3.5.1

Merge branch 'master' into release-3.5

Version set to 3.4.4

Merge branch 'master' into release-3.4

Merge branch 'master' into release-3.4

Merge branch 'master' into release-3.4

Fix upgrade script

Version set to 3.3.4.1