Merge branch 'master' into master

diff --cc CHANGES
index 913b07630a0044aec4a31a57e39fdc062f152dd0,23ab0ebac54482b2f04d4fc234877aea1a31b9bf..dae96573abb39b5e48afcb6bfddf99038068c406
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -6,7 -6,7 +6,8 @@@ Bugfixe
  * 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
 +* Python2.3 is deprecated and therefore, the Python bindings should use Python3 as default @pticon
+ * Fix issue where RRDtool detects a LINE or AREA with a constant numeric value as being exportable
  
  Features
  --------