R1:dfa2e29a012f

Merge pull request #73 from mareksapota-fb/master

Pull request for differential revision D1021