Merge branch 'libsndfile'