Manual merge of master into xovis branch

@tim-moody Why is this section called 'Links to Services'? Where are the links?