Reviewed r/1779, r/1785, and r/1789
Had 1:1 with jgriffin yesterday
Landed patch for bug 1020457
Patched bug 1025006