Merge pull request #2628 from abarth/aspect_ratio

AspectRatio should attempt to fit its height