Merge "Always set group_concat_max_len to avoid awful truncation gotcha"