Fixed status code.
Merged master.
Fixed conflict.