Issue #2730 - better handle types for expanded variables#2759

tiry wants to merge 4 commits intodocker:masterdocker/compose:masterfrom

tiry:mastertiry/compose:masterCopy head branch name to clipboard