Merge pull request #2154 from facebook/dev

v1.4.5