CHILD MASTER CHILD COMMIT

pull request from Masterchild to child master