Model generator: namespace, saving to file
Merge remote-tracking branch 'origin/master'