Merge.

diff --cc ChangeLog
index 79dc5997ee1729fa307ed2b34a49721c856450e1,a0698e8b1ad1dbf568d0dea2c43a9d685cedbf21..3191b89b567e495615aeea0849b64591fd7f5300
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,9 +1,11 @@@
  2016-02-16  Carl Hetherington  <cth@carlh.net>
  
 +      * Add option to auto-upload to TMS (#794).
 +
+       * Version 2.6.22 released.
+ 
+ 2016-02-16  Carl Hetherington  <cth@carlh.net>
+ 
        * Version 2.6.21 released.
  
  2016-02-15  Carl Hetherington  <cth@carlh.net>