Merge branch 'release'
Merge branch 'release'
Merge branch 'release'
Merge branch 'release'
Merge branch 'develop' into release
Merge branch 'release'
forgot a patch change in language file
Merge branch 'develop'
Merge branch 'master' into develop
don't show inactive members on roster
fix case (step1)
fix case (step2)
Merge branch 'master' into develop
Merge branch 'develop' into develop-2.0