SWC-570: pages returned are always html
Merge pull request #331 from jay-hodgson/release-t

SWC-570: pages returned are always html