added rss+xml as a possible link type in addition to just xml
Merge remote-tracking branch 'upstream/master'