Avoiding UTF-8 failures
Merge remote-tracking branch 'pof/master'