Fix for admin bar
Merge pull request #691 from damianregan/relativeurls

Fix for admin bar
Merge remote-tracking branch 'remotes/roots/master'