Fixed issue with wrong header being returned on content negotiation (should be 200, was 415).
Merge remote-tracking branch 'origin/master'