Merge "Fix for Bug 241."
drwxr-xr-x - code-generator
drwxr-xr-x - model
drwxr-xr-x - yang