Add support for HiDPI displays
Merge commit 'c82d207725d768fed02c6a9988965ad7b41d2336' into gh-pages