[Tutti-commits] 04/05: Merge branch 'master-3.x' into develop-3.x