Better fake data for external link factory
Merge remote-tracking branch 'phran/master'