Added back support for D7 and previous versions on make generate command
Merge pull request #992 from DavidHernandez/master

Fix regression in #903