Only show admin links for admins.
Merge remote-tracking branch 'upstream/master'