Merge "Fixed bad link caused by race conditions on git merges."