Merge branch 'maint'

Conflicts:

	tests/m_raid_opt/expect.1