R1:0cb9f3dcf5b8

Merge pull request #74 from mareksapota-fb/master

Pull request for differential revision D1019