Ensure the nice/useful channel label is always available for ADDE image
data sources via the %longname% macro [959]
Merge remote-tracking branch 'upstream/master' into longname
Merge remote-tracking branch 'upstream/master' into longname
Added extra null check [1477]
Merge pull request #46 from mhiley/longname

Merging this as a fix for inquiry [1477]