better ASPECT_FIT scaling and positioning logic
Merge branch 'master' of ../stage