Merge "Remove the showjumplinks user preference"