Improved OutOfOrder display string
Merge remote-tracking branch 'origin/master'
Removed trailing spaces, added trailing line feed at EOF
Merge remote-tracking branch 'upstream/master' into vertica