[#DEVSUPP-21:Fixed content type comparitions, added fallback to just type, and if does not work just treat content as text/plain]
[#DEVSUPP-21:Fixed merge]
[#DEVSUPP-21:Fixed merge]