remove nolink. Does not seem required
Merge remote-tracking branch 'origin/master' into dev