R1:38115118e9c2

Merge pull request #71 from mareksapota-fb/master

Pull request for differential revision D1014