# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1425581521 28800
# Node ID 46a465fb2aeed25138daed9e6b47faf464c20f2e
# Parent  242792d1e40a4be9e48d34473b070f4d69fe7735# Parent  1e7c8046a9f461bda3c8f6003dae65e235af8bb6
merge stable into default