Merge pull request #4348 from Memphiz/osxdisplayportbp