# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1403793109 -3600
# Node ID 404a000bb38b0139ad93feb4327a5f2d1ea8c0f8
# Parent  c863269aed013393a55c10ee295ddef3a8c7b420# Parent  a5ed07689dd32592513b12c30b341e76579da8a8
merge with stable