fix aspect ratio
Merge remote-tracking branch 'origin/version-3.0' into version-0.4