Merge pull request #1444 from andytaylor/master

release commits
add debug traces for http-upgrade code
Merge pull request #1445 from jmesnil/http-upgrade_debug

add debug traces for http-upgrade code
tmp stuff
tmp stuff
tmp stuff