Fix link parsing being too greedy

Change-Id: Idb4330289c3eb6a61d8f2de7f36bf0d93c9777ba
Merge "Fix link parsing being too greedy"