Merge branch 'hotfix-1.0.4'
Fix so dont erroring on admin sites.
Merge branch 'hotfix-1.0.5' into develop