Merge remote-tracking branch 'origin/7.x-2.x' into feature/fix-drush-make

Conflicts:
	common.make