Fix core parenting issue
Merge branch 'integration' of github.com:ecuzzillo/rts2 into integration