R1:2e174d8dbc65

Merge pull request #77 from mareksapota-fb/master

Pull request for differential revision D1048