Update the locale handler based upon changes from ThiefMaster
Update the locale handler based upon changes from ThiefMaster

lucius-feng/tinman,gmr/tinman,gmr/tinman,lucius-feng/tinman,lucius-feng/tinman