New upstream version 3.6.1

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