Merge master branch from parent project