+ocamlfind.1.5.4
Merge pull request #2876 from whitequark/findlib.1.5.4

+ocamlfind.1.5.4