[Maria-developers] 10.0 -> 10.1 merge