Adding self...
Merge branch 'master' into parent-callback