Merge branch 'master' into devel-3.0

diff --cc Detail.c
Simple merge

diff --cc Makefile
Simple merge

diff --cc ReadMe.c
Simple merge

diff --cc bitmap.c
Simple merge

diff --cc mdadm.h
Simple merge