Add support for additional attributes on 'link' method

such as title or class
Merge branch 'refs/heads/default-layout'