Issue #1158248 by tocab | rogical: Fixed Incompatibility with locale.module, update to latest Drupal.