UTF-8 for non-javascript browser
Merge remote-tracking branch 'lrsjng/develop' into develop