M: modified header manipulation method
Merge remote-tracking branch 'origin/master'

Conflicts:
	brocade/application.py