- rel 2; bugfixes for upstream 49058 and 39311 (prefork only)