Update header
Merge branch 'master' into db_timeouts