Fixed compilation in gcc 4.9.0, in http_runner.cc instantiation.
Merge branch 'next' into sam_2826
Merge branch 'sam_2826' into next