Fix Organization parent.setter method name
Merge branch 'master' into pr/1