After encountering an invalid UTF-8 sequence of 2 or more bytes, do not consume the invalid byte.
Merge branch '0.5.x' into 0.6.x