Fix handling of --header.
Merge branch 'develop'