Oops, put it in the wrong place.
Merge branch 'build-implicit-link' into integrate