R1:206546a6e305

Merge pull request #62 from abdul/master

Differential Revision: D909