Update some links [0]
Merge remote-tracking branch 'upstream/master' into trajectory