Pull merge commits from master