3x retina support
Merge pull request #3039 from danzel/3x-retina

3x retina support (Needs testing)