Be more friendly
Merge remote-tracking branch 'drkitty/friendly-labels' into Field_Names