Merge changes from master repository