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