Bringing it back in sync with DIBS master, just keeping own language file and changes.