Context of default fn changed to model not field
Merge branch 'functions_as_defaults' into fork