Merge branch 'master' into 2018-04-30-vdo-support

diff --cc Makefile.in
index 1b169457be91fefe5ee968c287e4c14e50ab99cf,746be15bef6a988f824e31c1083258bc92aa68b0..3274f174f2453d30e903dd4e9124a9ecf95947bf
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -210,12 -210,8 +210,10 @@@ endi
  
  endif
  
- ifeq ("$(TESTING)", "yes")
  include test/unit/Makefile
- endif
  
 +include device-mapper/Makefile
 +
  ifneq ($(shell which ctags),)
  .PHONY: tags
  tags: