Merge with 20140826-Xorg