Merge pull request #2452 from alarcher/libx11_compose