Default generate directory
Merge branch 'master' into oauth