fixed OS X build: USE_X11_RANDR wasn't defined
Merge branch 'master' into release