Bug 1054882 - Rollup patch.  r=till, r=sstangl, r=jorendorff