Add file for placing default_* statements.
Fix error in default_user example.
Merge upstream