#5598: New patch.
Merge branch '5598-toolbar_links' of github.com:openscholar/openscholar into 5598-toolbar_links