HiDPI support
Merge branch 'heroku'