Makefiles can have various names now.
Merge remote-tracking branch 'upstream/Gen7'