Use https for all downloads
Merge branch 'master' into v2.0

Conflicts:
	drupal-org.make
Use https for all downloads