Merge 3.4.0a4 release head back into trunk.

diff --cc Misc/NEWS
index 642acaccc698db277b58774a6c02c009e1ca252c,fc88fbf71092d4d3d323f8ba838e59cf25098a57..0773f9697a3f197f8ec8e9cd2c11af99e44b5226
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -13,9 -19,21 +19,36 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #16595: Add prlimit() to resource module.
+ 
+ - Issue #19324: Expose Linux-specific constants in resource module.
+ 
+ - Issue #17400: ipaddress should make it easy to identify rfc6598 addresses.
+ 
+ - Load SSL's error strings in hashlib.
+ 
+ - Issue #18527: Upgrade internal copy of zlib to 1.2.8.
+ 
+ - Issue #19274: Add a filterfunc parameter to PyZipFile.writepy.
+ 
++- Issue #8964: fix platform._sys_version to handle IronPython 2.6+.
++  Patch by Martin Matusiak.
++
++- Issue #18958: Improve error message for json.load(s) while passing a string
++  that starts with a UTF-8 BOM.
++
++- Issue #19307: Improve error message for json.load(s) while passing objects
++  of the wrong type.
++
++- Issue #16038: CVE-2013-1752: ftplib: Limit amount of data read by
++  limiting the call to readline().  Original patch by Michał
++  Jastrzębski and Giampaolo Rodola.
++
++- Issue #17087: Improved the repr for regular expression match objects.
++
  
  What's New in Python 3.4.0 Alpha 4?
- ================================
+ ===================================
  
  Release date: 2013-10-20