making link use the id if slug is not available
Merge remote-tracking branch 'dsc/develop' into develop
trying to fix Travis