Merge commit '07a39f12' into eclair * commit '07a39f12': Avoid a buffer overrun in GET_NORMALIZED_STRING.