fix x11test
Merge branch 'master' into sle12