Add xorg/bin to path.
Add xorg/bin to path.
Merge branch 'tmp'