Mark links as html safe now escaping is done automatically.
Update obsolete link
Merge branch 'develop'