Merge branch 'Celedhrim-master'
Set locale to UTF8.
Merge branch 'HurricaneHernandez-master' into gotham