Open file as UTF-8 so works with unicode
Merge remote-tracking branch 'upstream/master'