Default locale if one couldn't be negotiated
Merge remote branch 'KiwiIRC/development' into development