MTD: merge 3.18 development into -next development

To keep the two paths in sync