Merged upstream master into FlyBlind
Updated log header
Merge pull request #1 from crwper/merge_into_flyblind

Merge into flyblind