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.