Merge pull request #554 from giastfader/master

enforce json body conversion if application/json content type is specified