Issue 430 content negotiation

See #430 and #429.

<!---
@huboard:{"order":453.0,"custom_state":""}
-->