Remove an unreachable return statement.
traits defauts are strings not object

fix #4299
Merge pull request #4297 from abhinav-upadhyay/unreachable-code

Remove an unreachable return statement.
Merge pull request #4300 from Carreau/fix-4299

Traits defauts should be strings not object
Add -r option to %load. Applying a new patch ignoring whitespace changes