Update revision to 3.6.4.2.
Merge branch 'maint'

Use merge strategy -s ours to skip release commit.
Update revision to 3.6.5.
Merge branch 'master' into next

Used merge strategy -s ours to skip release commits.