Header fix

Merged André Anjos requested to merge header_fix into master

Merge request reports