3.0 merge

The change is `Response::_sendHeader()` to throw exception if headers are already sent is causing phpunit to barf. Not sure how to deal with that.