Merge proposals dependent on lp:~l3on/drupal-teams/7.x-dev_fixes

lp:~l3on/drupal-teams/7.x-dev_fixes has no merge proposals.