Upgrading ruby buildpack to v1.1.1
Upgrading nodejs buildpack to v1.0.2
Merge remote-tracking branch 'origin/pr/502' into develop
Merge remote-tracking branch 'origin/pr/503' into develop

Conflicts:
	config/blobs.yml