[RJA-1469] [feature] - Servers links #796

Merged
merged 2 commits into from Feb 1, 2013