merge dev_4_4 -D org -I include -E exclude: PR 549 (Zeiss LSM: use the longer display channel name)