Fix issue #91 - Feeds served with content-type text/html
Merge