Fix issue with header values where the default value was not being returned
Merge branch 'daley', remote-tracking branch 'origin'