Add terminal description to flight status information.
Merge remote-tracking branch 'origin/master'
Resolve merge conflicts.