Link to buildpacks.txt instead
Merge remote-tracking branch 'upstream/master'