Fix for timeout: Use as http option instead of sending as header.
Merge branch 'stage'