Add Python 2.6 changes to merged code