Merge.

diff --cc ChangeLog
index 0f1e7920f54aa0e21c1df0c7d9ad27605cfb4ff8,f2bd8dead84dd790d28f6af8c4a88b8e525da401..6ec63e8a0bcdc17343b15d5f410326c016582bce
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,6 +1,8 @@@
  2015-06-19  Carl Hetherington  <cth@carlh.net>
  
 +      * Fix non-working audio analysis dialogue.
++      
+       * Version 2.1.6 released.
  
  2015-06-18  Carl Hetherington  <cth@carlh.net>