Handle current page links a bit more elegantly
Merge branch 'v3'