#11694: merge with 3.4

diff --cc Misc/NEWS
index 9c655573ccf93765d44b81effbb82015007234ba,c490be5a3d4e1c42ccbcc20e58b2a337dc154689..856a62af17cd86ae245d6dc0f8d1efb5dedf7f81
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -169,13 -24,9 +169,16 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #11694: Raise ConversionError in xdrlib as documented.  Patch
+   by Filip Gruszczyński and Claudiu Popa.
+ 
 +- Issue #19380: Optimized parsing of regular expressions.
 +
 +- Issue #1519638: Now unmatched groups are replaced with empty strings in re.sub()
 +  and re.subn().
 +
 +- Issue #18615: sndhdr.what/whathdr now return a namedtuple.
 +
  - Issue #22462: Fix pyexpat's creation of a dummy frame to make it
    appear in exception tracebacks.