fix link displaying title instead of slug
Merge branch 'master' into develop

* master:
  fix link displaying title instead of slug