Cleanup header.
Merge branch 'develop'