Merge pull request #1 from dropbox/master

Changes form master