New upstream version 3.6.4

diff --cc .tag
index 9e5a91251dead093636f67888faac27b6b7aa643,6828f88dcb0e88b8cd738ad6044ce74d7a9a13c8..aaed0d4c1d6103333c8f473342680a5b85798872
--- 1/.tag
--- 2/.tag
+++ b/.tag
@@@ -1,1 -1,1 +1,1 @@@
- 5dfc0caab65080b4c3c8c3ac42bac766c11ea28c
 -$Format:%H$
++3ffb9827ba813c9163fafb2ab95e79efc46efe73