OS X clipboard sharing
Merge remote-tracking branch 'origin'