Explicitly define the encoding.
Merge branch '2.3' into 2.4

* 2.3:
  Explicitly define the encoding.
Merge branch '2.4'

* 2.4:
  Explicitly define the encoding.