fix redirect on admin https
Merge branch 'staging'