Merge branch 'hotfix/1.3-hf5'
Changed Forgot Password link location
Merge branch 'hotfix/1.3-hf6' into develop