Merge master back into subtree