Wed, 12 Aug 2015 20:38:39 -0700 merge with stable
Pierre-Yves David <pierre-yves.david@fb.com> [Wed, 12 Aug 2015 20:38:39 -0700] rev 1491
merge with stable
(0) -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 +1000 +3000 tip