Updated latest patch to core
Merge branch '7.x-2.x' of git.drupal.org:project/erpal into 7.x-2.x