Yuki Takei f6c228edf8 Merge branch 'master' into dev/4.0.x 6 lat temu
..
admin.json f6c228edf8 Merge branch 'master' into dev/4.0.x 6 lat temu
userInvitation.txt c289172857 fix using mailer codes 7 lat temu
userWaitingActivation.txt c289172857 fix using mailer codes 7 lat temu