Merge.

diff --cc ChangeLog
index 31c35e39253c590eed3a877e394440e8370d4276,653534d3647542f4b77c3a17bc7ad04c0fbed4de..4c5b04990adee9680aa1fac0db104391d5c4c5e3
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,16 +1,21 @@@
 +2015-09-09  c.hetherington  <cth@carlh.net>
 +
 +      * Use SRC_LINEAR when resampling for
 +      audio analysis to speed things up (#685).
 +
+ 2015-09-09  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 2.1.58 released.
+ 
+ 2015-09-09  Carl Hetherington  <cth@carlh.net>
+ 
+       * Actually fix missing libsamplerate
+       dylib for OS X.
+ 
+ 2015-09-08  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 2.1.57 released.
+ 
  2015-09-08  c.hetherington  <cth@carlh.net>
  
        * Missing libsamplerate dylib for OS X.