[Jredmine-commits] 05/06: Merge branch 'master' into develop