More generic grab_parents
Merge branch 'master' into production