Additional HTTP Status Codes
Merge branch 'master' into mwm