e2dce1e
Rebased to 3.8.2rc1 Patches 339 and 341 were backports, now included. No other patches changes required.