Fixed issue with logo link not working when context path is empty
Merge branch 'admin' into dev