merge from local branch, EGL platform support now has initial X support