[Tutti-commits] [tutti] 07/10: Merge branch 'release/3.6'