added back changes from 436685a2e4 (lost during merging 3.0.0 branch)

I added back changes from 436685a (navbar_links with arbitrary url support) which was lost during merging 3.0.0 branch.