Merge branch 'master' into devel-3.1

diff --cc Assemble.c
Simple merge

diff --cc Detail.c
Simple merge

diff --cc Manage.c
Simple merge

diff --cc ReadMe.c
Simple merge

diff --cc mdadm.8
Simple merge

diff --cc mdadm.c
Simple merge

diff --cc mdadm.h
Simple merge

diff --cc sysfs.c
Simple merge

diff --cc util.c
Simple merge