R1:9030f489cf52

Merge pull request #66 from mareksapota-fb/master

Pull request for differential revisions D1001, D1002 and D1004