Bring branch up to date with module changes in 1.x branch
Fix git.drupal.org error in travis
Merge branch '7.x-2.x' into 2.x