Merge branch 'vs15-rename-generator' into release