IDI-118: Fixed some URLs.
Merge branch 'IDI-118' into development