Merge branch 'master' into master

diff --cc CHANGES
index a7c4631dc1663f763f6015d149b0e16919ec4492,ed5e6fd22d5404ee48e7609d1008266e2de6c295..291cac7b39e26beefd9ae8eb3a6b6c2fa0485f52
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -3,7 -3,7 +3,9 @@@ RRDtool - master ..
  ====================
  Bugfixes
  --------
++
 +* Fix Compatiblity with TCL-9 @yselkowitz
+ * Correctly link Ruby Bindings @LevitatingBusinessMan
  * Fix MacOS Build error (no SOCK_CLOEXEC on mac) @ensc fixes oetiker#1261
  * Fix build on 32bits platforms (like armhf) when time_t is 64bits, fixes #1264
  * Fix compilation on illumos @hadfl