Fri, 08 Aug 2014 23:16:24 -0700 merge back with stable
Pierre-Yves David <pierre-yves.david@fb.com> [Fri, 08 Aug 2014 23:16:24 -0700] rev 1051
merge back with stable
(0) -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 +1000 +3000 tip