R1:9d4793b27f3d

Merge pull request #76 from mareksapota-fb/master

Pull request for differential revision D1044