Apply-patch-to-set-collation-to-utf8_swedish_ci
Merge commit '119d4b4' into 3.1