diff --git a/Misc/ACKS b/Misc/ACKS
index d5c509b..2ebe750 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -159,6 +159,7 @@
 Vincent Delft
 Erik Demaine
 Roger Dev
+Raghuram Devarakonda
 Toby Dickenson
 Mark Dickinson
 Yves Dionne
@@ -660,6 +661,7 @@
 Roger Upole
 Michael Urman
 Hector Urtubia
+Atul Varma
 Dmitry Vasiliev
 Frank Vercruesse
 Mike Verdone
diff --git a/Misc/NEWS b/Misc/NEWS
index 1008979..c789843 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -26,6 +26,13 @@
 Core and Builtins
 -----------------
 
+- Removed the __oct__ and __hex__ special methods and added a bin()
+  builtin function.
+
+- PEP 3127: octal literals now start with "0o". Old-style octal literals
+  are invalid. There are binary literals with a prefix of "0b".
+  This also affects int(x, 0).
+
 - None, True, False are now keywords.
 
 - PEP 3119: isinstance() and issubclass() can be overridden.
diff --git a/Misc/Vim/python.vim b/Misc/Vim/python.vim
index 21c375d..3886931 100644
--- a/Misc/Vim/python.vim
+++ b/Misc/Vim/python.vim
@@ -88,7 +88,7 @@
   syn keyword pythonException    MemoryError NameError NotImplementedError
   syn keyword pythonException    OSError OverflowError PendingDeprecationWarning
   syn keyword pythonException    ReferenceError RuntimeError RuntimeWarning
-  syn keyword pythonException    StandardError StopIteration SyntaxError
+  syn keyword pythonException    StopIteration SyntaxError
   syn keyword pythonException    SyntaxWarning SystemError SystemExit TabError
   syn keyword pythonException    TypeError UnboundLocalError UnicodeDecodeError
   syn keyword pythonException    UnicodeEncodeError UnicodeError
diff --git a/Misc/build.sh b/Misc/build.sh
index 4d7bddb..779ba93 100755
--- a/Misc/build.sh
+++ b/Misc/build.sh
@@ -70,7 +70,7 @@
 LEAKY_TESTS="test_(cmd_line|socket)"
 
 # These tests always fail, so skip them so we don't get false positives.
-_ALWAYS_SKIP="test_compiler test_transformer"
+_ALWAYS_SKIP=""
 ALWAYS_SKIP="-x $_ALWAYS_SKIP"
 
 # Skip these tests altogether when looking for leaks.  These tests
diff --git a/Misc/cheatsheet b/Misc/cheatsheet
index b1a428b..2ef871f 100644
--- a/Misc/cheatsheet
+++ b/Misc/cheatsheet
@@ -779,8 +779,8 @@
 class, the class name is printed, then a colon and a space, and
 finally the instance converted to a string using the built-in function
 str().
-All built-in exception classes derives from StandardError, itself
-derived from Exception.
+All built-in exception classes derives from Exception, itself
+derived from BaseException.
 
 Name Space Statements
 
@@ -1051,9 +1051,6 @@
          On 'sys.exit()'
     StopIteration
          Signal the end from iterator.__next__()
-    StandardError
-                 Base class for all built-in exceptions; derived from Exception
-    root class.
         ArithmeticError
                  Base class for OverflowError, ZeroDivisionError,
     FloatingPointError
diff --git a/Misc/python-mode.el b/Misc/python-mode.el
index 6e2741d..55ba602 100644
--- a/Misc/python-mode.el
+++ b/Misc/python-mode.el
@@ -369,7 +369,7 @@
 			  "NotImplementedError" "OSError" "OverflowError"
 			  "OverflowWarning" "PendingDeprecationWarning"
 			  "ReferenceError" "RuntimeError" "RuntimeWarning"
-			  "StandardError" "StopIteration" "SyntaxError"
+			  "StopIteration" "SyntaxError"
 			  "SyntaxWarning" "SystemError" "SystemExit"
 			  "TabError" "True" "TypeError" "UnboundLocalError"
 			  "UnicodeDecodeError" "UnicodeEncodeError"
diff --git a/Misc/valgrind-python.supp b/Misc/valgrind-python.supp
index 4a6710e..a08eaac 100644
--- a/Misc/valgrind-python.supp
+++ b/Misc/valgrind-python.supp
@@ -134,6 +134,15 @@
 ###
 
 {
+   Generic ubuntu ld problems
+   Memcheck:Addr8
+   obj:/lib/ld-2.4.so
+   obj:/lib/ld-2.4.so
+   obj:/lib/ld-2.4.so
+   obj:/lib/ld-2.4.so
+}
+
+{
    Generic gentoo ld problems
    Memcheck:Cond
    obj:/lib/ld-2.3.4.so