I love life. I also fixed the image view. Praise the Emperor.
Merge remote-tracking branch 'origin/master'