Prevent headers to be sent twice
Merge remote branch 'samalba/master'