Merge branch 'master' into v1_4_0

Conflicts:
	configure.ac

diff --cc configure.ac
index 94791d8edad149ccc86e2110cd74c1c37c16ebe1,00842da9bce555bd029cebe8b204803d75cd4167..fb434e9bee7ab0b62581a0ba6b89180ac37fad2a
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -7,7 -7,7 +7,7 @@@ AC_PREREQ([2.69]
  # For GIT versions, this is x.y.z-git, where x.y.z denotes the software
  # version that was used as a base + changes that were made later, but
  # are not released yet.
- AC_INIT(kea,1.4.0-beta, kea-dev@lists.isc.org)
 -AC_INIT(kea,1.4.0-git, kea-dev@lists.isc.org)
++AC_INIT(kea,1.4.0, kea-dev@lists.isc.org)
  AC_CONFIG_SRCDIR(README)
  
  # serial-tests is not available in automake version before 1.13, so