Merge pull request #2041 from popcornmix/display_aspect_ratio