Merge commit 'a6f0bc9c8f89fec87e6dd7d257aa7de15c979ca7' into drupal7