Fixed R build
Merge branch 'noX11' into devel