Normalize links (Fixes #1481).
Merge pull request #1561 from abuiles/normalizeLinksAMS

[BUGFIX release] AMS - Normalize links (Fixes #1481).