R1:fb5d76938c8d

Merge pull request #79 from mareksapota-fb/master

Pull request for differential revision D1060