Automatic merge from submit-queue

Fix make to include line-continuations

This got broken in recent changes.  Sorry for the noise.