bring up to date with unstable branch

diff --cc README.md
index 05129d9da955b36ddc8aeee7242500f50389c98f,9324e75c172fb257ea0175167f566e7f42e3176a..5895dca9c0fe6f7cb89572831fcb4179b5e604de
--- 1/README.md
--- 2/README.md
+++ b/README.md
@@@ -8,6 -8,4 +8,7 @@@ Shairport Sync runs on Linux and FreeBS
  
  **Warning**
  
 -This is the "unstable" branch. It is used for very preliminary unfinished or untested code and can change at any time and without warning.
 +This is the very unstable "transit" branch. It is used to move unfinished or untested code between development sites.
 +
 +To access the stable version, where changes are made after due time, please switch to the "master" branch.
++

diff --cc audio_alsa.c
Simple merge