Merge remote branch 'upstream/master'
Fixes #1154
Fixes #1857, #1959, #1978 ---Do not include the header if we want to redirect