Merge remote-tracking branch 'origin/patches-2.0'

diff --cc test/regress_et.c
index 23c65fe1179c8141f8a1d13a9d242a6643b23aea,32c7fb6b7ec0f6bd5330d0993eb44e9abc4b7e22..6d52f4d9d78e3c380b845c1aeb8f7537518d3d21
--- 1/test/regress_et.c
--- 2/test/regress_et.c
+++ b/test/regress_et.c
@@@ -23,10 -23,10 +23,10 @@@
   * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
- 
+ #include "../util-internal.h"
  #include "event2/event-config.h"
  
 -#ifdef WIN32
 +#ifdef _WIN32
  #include <winsock2.h>
  #endif
  #include <sys/types.h>