Merge branch 'master' into my-osx

diff --cc configure.ac
Simple merge

diff --cc error.h
index a64348e342e2aeef66a09b9e2e808f57366b002d,78e3242cdd71b0d5484033d671b24088e735bf91..89dbb0f69f1ffa984f740fa8b7a0e3b5d24d035b
--- 1/error.h
--- 2/error.h
+++ b/error.h
@@@ -556,9 -554,9 +564,10 @@@ SS_ENUM(WRITE)
  SS_ENUM(WRITE_COMMON);
  SS_ENUM(ALSA_WRITER);
  SS_ENUM(FILE_WRITER);
 +SS_ENUM(OSX_WRITER);
  SS_ENUM(RINGBUFFER);
  SS_ENUM(CLIENT);
+ SS_ENUM(CLIENT_COMMON);
  SS_ENUM(AUDIOC);
  /** \endcond */
  #undef PARA_ERROR