Merge branch '2.x' of git.drupal.org:project/ginvite into 2.x