Merge 20140826-Xorg with master