Some cleanup with USE_XRANDR flag
Merge branch 'master' into auto_ptr
another attempt to merge