disable remap_opt, it is now broken
Merge branch 'pixman' into devel