Bump python to 3.5

3.5 release is needed for MSVC 14.0 (aka VS 2015) support. Python 3.5
removed build toolchain support for MSVC 2013. Because we still need
to support it, we duplicate the Python directory in externals and
copy old patches and dispatch to this directory for MSVC 2013. Once
the support for MSVC 2013 is dropped on master, this directory can be
removed again.

Change-Id: Idf7bc351239582f583ecbdb53c923cbdcf968089
Reviewed-on: https://gerrit.libreoffice.org/17352
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>

14 files changed, 306 insertions, 408 deletions

diff --git a/external/python3/ExternalPackage_python3.mk b/external/python3/ExternalPackage_python3.mk
index a2f51c10be18..e132aab59532 100644
--- a/external/python3/ExternalPackage_python3.mk
+++ b/external/python3/ExternalPackage_python3.mk
@@ -53,60 +53,68 @@ $(eval $(call gb_ExternalPackage_add_file,python3,$(LIBO_BIN_FOLDER)/libpython$(
 # one of these failed to build.
 # Obviously this list should not contain stuff with external dependencies
 # that may not be available on baseline systems.
+
 ifneq ($(OS),AIX)
 $(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/lib-dynload,\
-	LO_lib/array.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/atexit.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/audioop.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/binascii.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/_bisect.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/cmath.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/_codecs_cn.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/_codecs_hk.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/_codecs_iso2022.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/_codecs_jp.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/_codecs_kr.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/_codecs_tw.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/_crypt.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/_csv.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/_ctypes.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/_ctypes_test.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/_datetime.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/_decimal.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/_elementtree.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/fcntl.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/grp.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/array.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/audioop.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/binascii.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_bisect.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/cmath.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_codecs_cn.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_codecs_hk.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_codecs_iso2022.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_codecs_jp.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_codecs_kr.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_codecs_tw.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_crypt.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_csv.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_ctypes.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_ctypes_test.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_datetime.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_decimal.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_elementtree.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/fcntl.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/grp.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
 	$(if $(DISABLE_OPENSSL),, \
-		LO_lib/_hashlib.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+		LO_lib/_hashlib.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
 	) \
-	LO_lib/_heapq.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/_json.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/_lsprof.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/math.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/mmap.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/_multibytecodec.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/_multiprocessing.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/nis.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/ossaudiodev.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/parser.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/_pickle.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/_posixsubprocess.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/pyexpat.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/_random.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/resource.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/select.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/_socket.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/spwd.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_heapq.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_json.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_lsprof.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_lzma.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/math.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/mmap.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_multibytecodec.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_multiprocessing.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/nis.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_opcode.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/ossaudiodev.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/parser.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_pickle.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_posixsubprocess.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/pyexpat.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_random.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/readline.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/resource.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/select.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_sha1.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_sha256.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_sha512.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_socket.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/spwd.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
 	$(if $(DISABLE_OPENSSL),, \
-		LO_lib/_ssl.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+		LO_lib/_ssl.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
 	) \
-	LO_lib/_struct.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/syslog.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/termios.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/_testbuffer.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/_testcapi.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/time.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
-	LO_lib/zlib.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_struct.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/syslog.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/termios.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_testbuffer.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_testcapi.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_testimportmultiple.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/_testmultiphase.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/xxlimited.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/zlib.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
 ))
 endif
 endif
@@ -159,11 +167,16 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
 	LICENSE \
 	Lib/__future__.py \
 	Lib/__phello__.foo.py \
+	Lib/_bootlocale.py \
+	Lib/_collections_abc.py \
 	Lib/_compat_pickle.py \
+	Lib/_compression.py \
 	Lib/_dummy_thread.py \
 	Lib/_markupbase.py \
 	Lib/_osx_support.py \
+	Lib/_pydecimal.py \
 	Lib/_pyio.py \
+	Lib/_sitebuiltins.py \
 	Lib/_strptime.py \
 	Lib/_threading_local.py \
 	Lib/_weakrefset.py \
@@ -179,7 +192,6 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
 	Lib/binhex.py \
 	Lib/bisect.py \
 	Lib/bz2.py \
-	Lib/cProfile.py \
 	Lib/calendar.py \
 	Lib/cgi.py \
 	Lib/cgitb.py \
@@ -194,6 +206,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
 	Lib/contextlib.py \
 	Lib/copy.py \
 	Lib/copyreg.py \
+	Lib/cProfile.py \
 	Lib/crypt.py \
 	Lib/csv.py \
 	Lib/datetime.py \
@@ -202,6 +215,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
 	Lib/dis.py \
 	Lib/doctest.py \
 	Lib/dummy_threading.py \
+	Lib/enum.py \
 	Lib/filecmp.py \
 	Lib/fileinput.py \
 	Lib/fnmatch.py \
@@ -240,9 +254,10 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
 	Lib/nturl2path.py \
 	Lib/numbers.py \
 	Lib/opcode.py \
+	Lib/operator.py \
 	Lib/optparse.py \
 	Lib/os.py \
-	Lib/os2emxpath.py \
+	Lib/pathlib.py \
 	Lib/pdb.py \
 	Lib/pickle.py \
 	Lib/pickletools.py \
@@ -256,20 +271,22 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
 	Lib/profile.py \
 	Lib/pstats.py \
 	Lib/pty.py \
-	Lib/py_compile.py \
 	Lib/pyclbr.py \
+	Lib/py_compile.py \
 	Lib/pydoc.py \
 	Lib/queue.py \
 	Lib/quopri.py \
 	Lib/random.py \
-	Lib/re.py \
 	Lib/reprlib.py \
+	Lib/re.py \
 	Lib/rlcompleter.py \
 	Lib/runpy.py \
 	Lib/sched.py \
 	Lib/shelve.py \
+	Lib/selectors.py \
 	Lib/shlex.py \
 	Lib/shutil.py \
+	Lib/signal.py \
 	Lib/site.py \
 	Lib/smtpd.py \
 	Lib/smtplib.py \
@@ -280,9 +297,10 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
 	Lib/sre_constants.py \
 	Lib/sre_parse.py \
 	Lib/ssl.py \
+	Lib/statistics.py \
 	Lib/stat.py \
-	Lib/string.py \
 	Lib/stringprep.py \
+	Lib/string.py \
 	Lib/struct.py \
 	Lib/subprocess.py \
 	Lib/sunau.py \
@@ -297,13 +315,14 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
 	Lib/this.py \
 	Lib/threading.py \
 	Lib/timeit.py \
-	Lib/token.py \
 	Lib/tokenize.py \
-	Lib/trace.py \
+	Lib/token.py \
 	Lib/traceback.py \
+	Lib/trace.py \
 	Lib/tty.py \
 	Lib/turtle.py \
 	Lib/types.py \
+	Lib/typing.py \
 	Lib/uu.py \
 	Lib/uuid.py \
 	Lib/warnings.py \
@@ -351,6 +370,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
 $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/distutils,\
 	Lib/distutils/README \
 	Lib/distutils/__init__.py \
+	Lib/distutils/_msvccompiler.py \
 	Lib/distutils/archive_util.py \
 	Lib/distutils/bcppcompiler.py \
 	Lib/distutils/ccompiler.py \
@@ -362,7 +382,6 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
 	Lib/distutils/dep_util.py \
 	Lib/distutils/dir_util.py \
 	Lib/distutils/dist.py \
-	Lib/distutils/emxccompiler.py \
 	Lib/distutils/errors.py \
 	Lib/distutils/extension.py \
 	Lib/distutils/fancy_getopt.py \
@@ -394,6 +413,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
 	Lib/distutils/command/build_scripts.py \
 	Lib/distutils/command/check.py \
 	Lib/distutils/command/clean.py \
+	Lib/distutils/command/command_template \
 	Lib/distutils/command/config.py \
 	Lib/distutils/command/install_data.py \
 	Lib/distutils/command/install_egg_info.py \
@@ -406,6 +426,8 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
 	Lib/distutils/command/upload.py \
 	Lib/distutils/command/wininst-10.0-amd64.exe \
 	Lib/distutils/command/wininst-10.0.exe \
+	Lib/distutils/command/wininst-14.0-amd64.exe \
+	Lib/distutils/command/wininst-14.0.exe \
 	Lib/distutils/command/wininst-6.0.exe \
 	Lib/distutils/command/wininst-7.1.exe \
 	Lib/distutils/command/wininst-8.0.exe \
@@ -422,6 +444,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
 	Lib/email/architecture.rst \
 	Lib/email/base64mime.py \
 	Lib/email/charset.py \
+	Lib/email/contentmanager.py \
 	Lib/email/encoders.py \
 	Lib/email/errors.py \
 	Lib/email/feedparser.py \
@@ -460,6 +483,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
 	Lib/encodings/cp037.py \
 	Lib/encodings/cp1006.py \
 	Lib/encodings/cp1026.py \
+	Lib/encodings/cp1125.py \
 	Lib/encodings/cp1140.py \
 	Lib/encodings/cp1250.py \
 	Lib/encodings/cp1251.py \
@@ -531,7 +555,9 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
 	Lib/encodings/iso8859_9.py \
 	Lib/encodings/johab.py \
 	Lib/encodings/koi8_r.py \
+	Lib/encodings/koi8_t.py \
 	Lib/encodings/koi8_u.py \
+	Lib/encodings/kz1048.py \
 	Lib/encodings/latin_1.py \
 	Lib/encodings/mac_arabic.py \
 	Lib/encodings/mac_centeuro.py \
@@ -588,6 +614,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
 $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/importlib,\
 	Lib/importlib/__init__.py \
 	Lib/importlib/_bootstrap.py \
+	Lib/importlib/_bootstrap_external.py \
 	Lib/importlib/abc.py \
 	Lib/importlib/machinery.py \
 	Lib/importlib/util.py \
@@ -602,10 +629,10 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
 ))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/lib2to3,\
-	Lib/lib2to3/Grammar.txt \
-	Lib/lib2to3/PatternGrammar.txt \
 	Lib/lib2to3/__init__.py \
 	Lib/lib2to3/__main__.py \
+	Lib/lib2to3/Grammar.txt \
+	Lib/lib2to3/PatternGrammar.txt \
 	Lib/lib2to3/btm_matcher.py \
 	Lib/lib2to3/btm_utils.py \
 	Lib/lib2to3/fixer_base.py \
@@ -620,6 +647,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
 $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/lib2to3/fixes,\
 	Lib/lib2to3/fixes/__init__.py \
 	Lib/lib2to3/fixes/fix_apply.py \
+	Lib/lib2to3/fixes/fix_asserts.py \
 	Lib/lib2to3/fixes/fix_basestring.py \
 	Lib/lib2to3/fixes/fix_buffer.py \
 	Lib/lib2to3/fixes/fix_callable.py \
@@ -656,6 +684,7 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
 	Lib/lib2to3/fixes/fix_raise.py \
 	Lib/lib2to3/fixes/fix_raw_input.py \
 	Lib/lib2to3/fixes/fix_reduce.py \
+	Lib/lib2to3/fixes/fix_reload.py \
 	Lib/lib2to3/fixes/fix_renames.py \
 	Lib/lib2to3/fixes/fix_repr.py \
 	Lib/lib2to3/fixes/fix_set_literal.py \
@@ -693,14 +722,21 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
 $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/multiprocessing,\
 	Lib/multiprocessing/__init__.py \
 	Lib/multiprocessing/connection.py \
-	Lib/multiprocessing/forking.py \
+	Lib/multiprocessing/context.py \
+	Lib/multiprocessing/forkserver.py \
 	Lib/multiprocessing/heap.py \
 	Lib/multiprocessing/managers.py \
-	Lib/multiprocessing/pool.py \
+	Lib/multiprocessing/popen_fork.py \
+	Lib/multiprocessing/popen_forkserver.py \
+	Lib/multiprocessing/popen_spawn_posix.py \
+	Lib/multiprocessing/popen_spawn_win32.py \
 	Lib/multiprocessing/process.py \
 	Lib/multiprocessing/queues.py \
 	Lib/multiprocessing/reduction.py \
+	Lib/multiprocessing/resource_sharer.py \
+	Lib/multiprocessing/semaphore_tracker.py \
 	Lib/multiprocessing/sharedctypes.py \
+	Lib/multiprocessing/spawn.py \
 	Lib/multiprocessing/synchronize.py \
 	Lib/multiprocessing/util.py \
 ))
@@ -732,6 +768,8 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/unittest/test,\
 	Lib/unittest/test/__init__.py \
+	Lib/unittest/test/__main__.py \
+	Lib/unittest/test/_test_warnings.py \
 	Lib/unittest/test/dummy.py \
 	Lib/unittest/test/support.py \
 	Lib/unittest/test/test_assertions.py \
@@ -746,11 +784,11 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/p
 	Lib/unittest/test/test_setups.py \
 	Lib/unittest/test/test_skipping.py \
 	Lib/unittest/test/test_suite.py \
-	Lib/unittest/test/_test_warnings.py \
 ))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,python3,$(LIBO_BIN_FOLDER)/python-core-$(PYTHON_VERSION)/lib/unittest/test/testmock,\
 	Lib/unittest/test/testmock/__init__.py \
+	Lib/unittest/test/testmock/__main__.py \
 	Lib/unittest/test/testmock/support.py \
 	Lib/unittest/test/testmock/testcallable.py \
 	Lib/unittest/test/testmock/testhelpers.py \
diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk
index 098b1ea6957e..72afab7226e8 100644
--- a/external/python3/ExternalProject_python3.mk
+++ b/external/python3/ExternalProject_python3.mk
@@ -136,8 +136,7 @@ $(call gb_ExternalProject_get_state_target,python3,fixinstallnames) : $(call gb_
 $(call gb_ExternalProject_get_state_target,python3,executables) : $(call gb_ExternalProject_get_state_target,python3,build)
 	cd $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/bin ; \
 	for file in python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR) \
-	            python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m \
-	            pythonw$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR) ; do \
+	            python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m ; do \
 	$(INSTALL_NAME_TOOL) -change \
 		$(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/LibreOfficePython \
 		@executable_path/../LibreOfficePython $$file ; done
diff --git a/external/python3/UnpackedTarball_python3.mk b/external/python3/UnpackedTarball_python3.mk
index b091bfcb4738..37b05c9fadf1 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -17,24 +17,20 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,python3,\
 
 $(eval $(call gb_UnpackedTarball_add_patches,python3,\
 	external/python3/i100492-freebsd.patch.1 \
-	external/python3/python-3.3.0-i42553.patch.2 \
 	external/python3/python-3.3.3-aix.patch.1 \
 	external/python3/python-3.3.0-darwin.patch.1 \
-	external/python3/python-3.3.0-msvc2012.patch.1 \
 	external/python3/python-3.3.0-msvc-disable.patch.1 \
-	external/python3/python-3.3.0-msvc-x64.patch.1 \
 	external/python3/python-3.3.0-ssl.patch.1 \
-	external/python3/python-3.3.0-gcc-4.8.patch.1 \
+	external/python3/python-3.3.3-py17797.patch.1 \
+	external/python3/python-3.3.0-i42553.patch.2 \
 	external/python3/python-3.3.0-pythreadstate.patch.1 \
 	external/python3/python-3.3.0-clang.patch.1 \
-	external/python3/python-3.3.3-py17797.patch.1 \
-	external/python3/python-3.3.3-msvc2012-winxp.patch.1 \
 	external/python3/python-3.3.5-pyexpat-symbols.patch.1 \
 	external/python3/python-3.3.5-vs2013.patch.1 \
-	external/python3/python-3.3.5-darwin-gnu-xargs.patch.1 \
-	external/python3/python-msvc-disable-sse2.patch.1 \
 	external/python3/python-lsan.patch.0 \
 	external/python3/ubsan.patch.0 \
+	external/python3/python-3.5.tweak.strip.soabi.patch \
+	external/python3/python-3.5.0-tcltk.disable.patch \
 ))
 
 ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD SOLARIS,$(OS)),)
diff --git a/external/python3/i100492-freebsd.patch.1 b/external/python3/i100492-freebsd.patch.1
index 7189a7e81956..9b4b33729f75 100644
--- a/external/python3/i100492-freebsd.patch.1
+++ b/external/python3/i100492-freebsd.patch.1
@@ -1,30 +1,18 @@
 FreeBSD porting fixes, patch by maho@openoffice.org
 
---- Python-3.3.0/configure	2012-11-28 09:00:41.094955090 +0000
-+++ Python-3.3.0/configure	2012-11-28 09:01:13.033329526 +0000
-@@ -5545,11 +5545,6 @@
- 	  LDLIBRARY='libpython$(LDVERSION).so'
- 	  BLDLIBRARY='-L. -lpython$(LDVERSION)'
- 	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
--	  case $ac_sys_system in
--	      FreeBSD*)
--		SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
--		;;
--	  esac
- 	  INSTSONAME="$LDLIBRARY".$SOVERSION
- 	  if test "$with_pydebug" != yes
-           then
---- Python-3.3.0/Lib/test/test_threading.py	2012-11-28 09:00:41.292957412 +0000
-+++ Python-3.3.0/Lib/test/test_threading.py	2012-11-28 09:01:13.017329339 +0000
-@@ -451,7 +451,7 @@
-     # #12316 and #11870), and fork() from a worker thread is known to trigger
-     # problems with some operating systems (issue #3863): skip problematic tests
-     # on platforms known to behave badly.
--    platforms_to_skip = ('freebsd4', 'freebsd5', 'freebsd6', 'netbsd5',
-+    platforms_to_skip = ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'netbsd5',
-                          'os2emx', 'hp-ux11')
+--- python3.orig/Lib/test/test_threading.py	2015-07-05 18:50:07.000000000 +0200
++++ python3/Lib/test/test_threading.py	2015-07-26 17:03:55.935367820 +0200
+@@ -24,8 +24,8 @@
+ # #12316 and #11870), and fork() from a worker thread is known to trigger
+ # problems with some operating systems (issue #3863): skip problematic tests
+ # on platforms known to behave badly.
+-platforms_to_skip = ('freebsd4', 'freebsd5', 'freebsd6', 'netbsd5',
+-                     'hp-ux11')
++platforms_to_skip = ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'netbsd5',
++                     'os2emx', 'hp-ux11')
  
-     def _run_and_join(self, script):
+ 
+ # A trivial mutable counter.
 --- Python-3.3.0/Python/thread_pthread.h	2012-11-28 09:00:41.097955124 +0000
 +++ Python-3.3.0/Python/thread_pthread.h	2012-11-28 09:01:13.018329351 +0000
 @@ -42,6 +42,10 @@
diff --git a/external/python3/python-3.3.0-darwin.patch.1 b/external/python3/python-3.3.0-darwin.patch.1
index a709473d7e71..2cf5bbb9e1bd 100644
--- a/external/python3/python-3.3.0-darwin.patch.1
+++ b/external/python3/python-3.3.0-darwin.patch.1
@@ -2,14 +2,14 @@
 
 LO needs to build both against MacOSX SDK and not produce universal binaries.
 
-diff -ru python3.old_/configure python3/configure
---- python3.old_/configure	2012-09-29 10:00:50.000000000 +0200
-+++ python3/configure	2012-11-13 16:37:26.030013256 +0100
-@@ -6353,7 +6353,19 @@
- 	    if test "${enable_universalsdk}"; then
- 		UNIVERSAL_ARCH_FLAGS=""
- 	        if test "$UNIVERSAL_ARCHS" = "32-bit" ; then
--		   UNIVERSAL_ARCH_FLAGS="-arch ppc -arch i386"
+diff -ru python3.orig/configure python3/configure
+--- python3.orig/configure	2015-07-26 17:36:11.808497783 +0200
++++ python3/configure	2015-07-26 17:38:49.016508337 +0200
+@@ -6794,7 +6794,20 @@
+         then
+             case "$UNIVERSAL_ARCHS" in
+             32-bit)
+-               UNIVERSAL_ARCH_FLAGS="-arch ppc -arch i386"
 +           # LO does not use Universal Binaries (but the only way to set a SDK
 +           # here implies that, so de-universalize here...)
 +           case `/usr/bin/arch` in
@@ -23,36 +23,16 @@ diff -ru python3.old_/configure python3/configure
 +               as_fn_error $? "Unexpected output of 'arch' on OSX" "$LINENO" 5
 +               ;;
 +           esac
- 		   ARCH_RUN_32BIT=""
- 		   LIPO_32BIT_FLAGS=""
- 	         elif test "$UNIVERSAL_ARCHS" = "64-bit" ; then
-
-On OS X avoid /usr/local/lib and include like the plague, we don't
-want to accidentally get some MacPorts etc stuff.
-
-On OS X, always run the compiler (which is Clang, not gcc) to find out
-what the include paths are. On a clean modern installation, there is
-no /usr/include.
-
---- python3/setup.py
-+++ python3/setup.py
-@@ -460,11 +460,11 @@
-         # Ensure that /usr/local is always used, but the local build
-         # directories (i.e. '.' and 'Include') must be first.  See issue
-         # 10520.
--        if not cross_compiling:
-+        if not cross_compiling and host_platform != 'darwin':
-             add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-             add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
-         # only change this for cross builds for 3.3, issues on Mageia
--        if cross_compiling:
-+        if cross_compiling or host_platform == 'darwin':
-             self.add_gcc_paths()
-         self.add_multiarch_paths()
- 
---- python3/Mac/Makefile.in.orig	2013-09-13 20:16:50.558137603 +0200
-+++ python3/Mac/Makefile.in	2013-09-13 21:57:14.790962423 +0200
-@@ -39,7 +39,7 @@
++
+                LIPO_32BIT_FLAGS=""
+                ARCH_RUN_32BIT=""
+                ;;
+Only in python3: .#configure
+Only in python3: #configure#
+diff -ru python3.orig/Mac/Makefile.in python3/Mac/Makefile.in
+--- python3.orig/Mac/Makefile.in	2015-07-05 18:50:07.000000000 +0200
++++ python3/Mac/Makefile.in	2015-07-26 17:40:14.860514100 +0200
+@@ -43,7 +43,7 @@
  INSTALL_SCRIPT= @INSTALL_SCRIPT@
  INSTALL_DATA=@INSTALL_DATA@
  LN=@LN@
@@ -61,8 +41,21 @@ no /usr/include.
  CPMAC=CpMac
  
  APPTEMPLATE=$(srcdir)/Resources/app
---- python3/Mac/Resources/framework/Info.plist.in
-+++ python3/Mac/Resources/framework/Info.plist.in
+diff -ru python3.orig/Mac/Resources/app/Info.plist.in python3/Mac/Resources/app/Info.plist.in
+--- python3.orig/Mac/Resources/app/Info.plist.in	2015-07-05 18:50:07.000000000 +0200
++++ python3/Mac/Resources/app/Info.plist.in	2015-07-26 17:42:00.974521224 +0200
+@@ -18,7 +18,7 @@
+ 		</dict>
+ 	</array>
+ 	<key>CFBundleExecutable</key>
+-	<string>Python</string>
++	<string>LibreOfficePython</string>
+ 	<key>CFBundleGetInfoString</key>
+ 	<string>%version%, (c) 2001-2015 Python Software Foundation.</string>
+ 	<key>CFBundleHelpBookFolder</key>
+diff -ru python3.orig/Mac/Resources/framework/Info.plist.in python3/Mac/Resources/framework/Info.plist.in
+--- python3.orig/Mac/Resources/framework/Info.plist.in	2015-07-05 18:50:07.000000000 +0200
++++ python3/Mac/Resources/framework/Info.plist.in	2015-07-26 17:41:15.996518204 +0200
 @@ -5,7 +5,7 @@
  	<key>CFBundleDevelopmentRegion</key>
  	<string>English</string>
@@ -72,14 +65,19 @@ no /usr/include.
  	<key>CFBundleGetInfoString</key>
  	<string>Python Runtime and Library</string>
  	<key>CFBundleIdentifier</key>
---- python3/Mac/Resources/app/Info.plist.in
-+++ python3/Mac/Resources/app/Info.plist.in
-@@ -18,7 +18,7 @@
- 		</dict>
- 	</array>
- 	<key>CFBundleExecutable</key>
--	<string>Python</string>
-+	<string>LibreOfficePython</string>
- 	<key>CFBundleGetInfoString</key>
- 	<string>%version%, (c) 2004-2014 Python Software Foundation.</string>
- 	<key>CFBundleHelpBookFolder</key>
+diff -ru python3.orig/setup.py python3/setup.py
+--- python3.orig/setup.py	2015-07-26 17:36:11.804497783 +0200
++++ python3/setup.py	2015-07-26 17:39:48.599512337 +0200
+@@ -468,11 +468,11 @@
+         # Ensure that /usr/local is always used, but the local build
+         # directories (i.e. '.' and 'Include') must be first.  See issue
+         # 10520.
+-        if not cross_compiling:
++        if not cross_compiling and host_platform != 'darwin':
+             add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
+             add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
+         # only change this for cross builds for 3.3, issues on Mageia
+-        if cross_compiling:
++        if cross_compiling or host_platform == 'darwin':
+             self.add_gcc_paths()
+         self.add_multiarch_paths()
diff --git a/external/python3/python-3.3.0-gcc-4.8.patch.1 b/external/python3/python-3.3.0-gcc-4.8.patch.1
index 8fb7107ff299..6af06b338e96 100644
--- a/external/python3/python-3.3.0-gcc-4.8.patch.1
+++ b/external/python3/python-3.3.0-gcc-4.8.patch.1
@@ -1,10 +1,11 @@
---- Python-3.3.0/Include/modsupport.h	2012-09-29 10:00:26.000000000 +0200
-+++ Python-3.3.0/Include/modsupport.h	2013-03-08 10:46:28.671938738 +0100
+diff -ru python3.orig/Include/modsupport.h python3/Include/modsupport.h
+--- python3.orig/Include/modsupport.h	2015-07-05 18:50:06.000000000 +0200
++++ python3/Include/modsupport.h	2015-07-26 18:21:30.717680314 +0200
 @@ -26,7 +26,11 @@
  /* Due to a glitch in 3.2, the _SizeT versions weren't exported from the DLL. */
  #if !defined(PY_SSIZE_T_CLEAN) || !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
  PyAPI_FUNC(int) PyArg_Parse(PyObject *, const char *, ...);
--PyAPI_FUNC(int) PyArg_ParseTuple(PyObject *, const char *, ...) Py_FORMAT_PARSETUPLE(PyArg_ParseTuple, 2, 3);
+-PyAPI_FUNC(int) PyArg_ParseTuple(PyObject *, const char *, ...);
 +PyAPI_FUNC(int) PyArg_ParseTuple(PyObject *, const char *, ...)
 +#ifdef PY_SSIZE_T_CLEAN
 +    Py_FORMAT_PARSETUPLE(PyArg_ParseTuple, 2, 3)
diff --git a/external/python3/python-3.3.0-msvc-disable.patch.1 b/external/python3/python-3.3.0-msvc-disable.patch.1
index 6a6a9509a4ef..bb0a57f4c032 100644
--- a/external/python3/python-3.3.0-msvc-disable.patch.1
+++ b/external/python3/python-3.3.0-msvc-disable.patch.1
@@ -1,20 +1,18 @@
 Disable some stuff LO does not need, especially stuff with external dependencies
 
-diff -ru python3/PCbuild/pcbuild.sln python3.new/PCbuild/pcbuild.sln
---- python3/PCbuild/pcbuild.sln	2012-09-29 10:00:48.000000000 +0200
-+++ python3.new/PCbuild/pcbuild.sln	2012-11-12 22:13:49.445159668 +0100
-@@ -12,10 +12,6 @@
+diff -ru python3.orig/PCbuild/pcbuild.sln python3/PCbuild/pcbuild.sln
+--- python3.orig/PCbuild/pcbuild.sln	2015-07-26 17:43:52.262528695 +0200
++++ python3/PCbuild/pcbuild.sln	2015-07-26 18:00:18.438594901 +0200
+@@ -12,8 +12,6 @@
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythoncore", "pythoncore.vcxproj", "{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}"
  EndProject
 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythonw", "pythonw.vcxproj", "{F4229CC3-873C-49AE-9729-DD308ED4CD4A}"
 -EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "w9xpopen", "w9xpopen.vcxproj", "{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}"
--EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_buildinfo", "make_buildinfo.vcxproj", "{C73F0EC1-358B-4177-940F-0846AC8B04CD}"
- EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsound", "winsound.vcxproj", "{28B5D777-DDF2-4B6B-B34F-31D938813856}"
-@@ -32,30 +28,16 @@
+ EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_decimal", "_decimal.vcxproj", "{0E9791DB-593A-465F-98BC-681011311617}"
+@@ -28,32 +26,18 @@
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_socket", "_socket.vcxproj", "{86937F53-C189-40EF-8CE8-8759D8E7D480}"
  EndProject
@@ -24,6 +22,8 @@ diff -ru python3/PCbuild/pcbuild.sln python3.new/PCbuild/pcbuild.sln
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testcapi", "_testcapi.vcxproj", "{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}"
  EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testimportmultiple", "_testimportmultiple.vcxproj", "{36D0C52C-DF4E-45D0-8BC7-E294C3ABC781}"
+ EndProject
 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcxproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}"
 -EndProject
 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bz2", "_bz2.vcxproj", "{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}"
@@ -36,7 +36,7 @@ diff -ru python3/PCbuild/pcbuild.sln python3.new/PCbuild/pcbuild.sln
  EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyexpat", "pyexpat.vcxproj", "{D06B6426-4762-44CC-8BAD-D79052507F2F}"
  EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "bdist_wininst.vcxproj", "{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}"
+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "..\PC\bdist_wininst\bdist_wininst.vcxproj", "{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}"
 -EndProject
 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcxproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}"
 -EndProject
@@ -44,4 +44,4 @@ diff -ru python3/PCbuild/pcbuild.sln python3.new/PCbuild/pcbuild.sln
 -EndProject
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcxproj", "{9E48B300-37D1-11DD-8C41-005056C00008}"
  EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssl", "ssl.vcxproj", "{E5B04CC0-EB4C-42AB-B4DC-18EF95F864B0}"
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python3dll", "python3dll.vcxproj", "{885D4898-D08D-4091-9C40-C700CFE3FC5A}"
diff --git a/external/python3/python-3.3.0-ssl.patch.1 b/external/python3/python-3.3.0-ssl.patch.1
index b85fe076fff8..e43a7b332a88 100644
--- a/external/python3/python-3.3.0-ssl.patch.1
+++ b/external/python3/python-3.3.0-ssl.patch.1
@@ -2,186 +2,55 @@
 
 Tweak SSL build to find OpenSSL in solver & not build it itself in "ssl.vcproj" etc.
 
-diff -ru python3.old_/Modules/Setup.dist python3/Modules/Setup.dist
---- python3.old_/Modules/Setup.dist	2012-09-29 10:00:42.000000000 +0200
-+++ python3/Modules/Setup.dist	2012-11-13 14:19:01.994158111 +0100
-@@ -236,14 +236,14 @@
- # The _md5 module implements the RSA Data Security, Inc. MD5
- # Message-Digest Algorithm, described in RFC 1321.
- 
--#_md5 md5module.c
-+_md5 md5module.c
- 
- 
- # The _sha module implements the SHA checksum algorithms.
- # (NIST's Secure Hash Algorithms.)
--#_sha1 sha1module.c
--#_sha256 sha256module.c
--#_sha512 sha512module.c
-+_sha1 sha1module.c
-+_sha256 sha256module.c
-+_sha512 sha512module.c
- 
- 
- # The _tkinter module.
-diff -ru python3.old_/PCbuild/pcbuild.sln python3/PCbuild/pcbuild.sln
---- python3.old_/PCbuild/pcbuild.sln	2012-09-29 10:00:48.000000000 +0200
-+++ python3/PCbuild/pcbuild.sln	2012-11-13 14:50:39.220142472 +0100
-@@ -58,8 +58,6 @@
+diff -ru python3.orig/PCbuild/pcbuild.sln python3/PCbuild/pcbuild.sln
+--- python3.orig/PCbuild/pcbuild.sln	2015-08-22 18:57:16.653719900 +0200
++++ python3/PCbuild/pcbuild.sln	2015-08-22 19:03:06.062853000 +0200
+@@ -64,10 +64,6 @@
  EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcxproj", "{9E48B300-37D1-11DD-8C41-005056C00008}"
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tk", "tk.vcxproj", "{7E85ECCF-A72C-4DA4-9E52-884508E80BA1}"
  EndProject
--Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssl", "ssl.vcxproj", "{E5B04CC0-EB4C-42AB-B4DC-18EF95F864B0}"
+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libeay", "libeay.vcxproj", "{E5B04CC0-EB4C-42AB-B4DC-18EF95F864B0}"
 -EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kill_python", "kill_python.vcxproj", "{6DE10744-E396-40A5-B4E2-1B69AA7C8D31}"
- EndProject
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python3dll", "python3dll.vcxproj", "{885D4898-D08D-4091-9C40-C700CFE3FC5A}"
-diff -ru python3.old_/PCbuild/_ssl.vcxproj python3/PCbuild/_ssl.vcxproj
---- python3.old_/PCbuild/_ssl.vcxproj	2012-09-29 10:00:48.000000000 +0200
-+++ python3/PCbuild/_ssl.vcxproj	2012-11-13 14:55:50.298137715 +0100
-@@ -151,14 +151,14 @@
+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssleay", "ssleay.vcxproj", "{10615B24-73BF-4EFA-93AA-236916321317}"
+-EndProject
+ Global
+ 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ 		Debug|Win32 = Debug|Win32
+diff -ru python3.orig/PCbuild/_ssl.vcxproj python3/PCbuild/_ssl.vcxproj
+--- python3.orig/PCbuild/_ssl.vcxproj   2015-08-11 02:52:36.000000000 +0200
++++ python3/PCbuild/_ssl.vcxproj        2015-08-22 18:19:20.744299000 +0200
+@@ -61,10 +61,10 @@
    </PropertyGroup>
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-     <ClCompile>
--      <AdditionalIncludeDirectories>$(opensslDir)\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>$(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-     </ClCompile>
-     <PreLinkEvent>
-       <Command>
-       </Command>
-     </PreLinkEvent>
-     <Link>
--      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32\libeay32.lib;$(opensslDir)\out32\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>ws2_32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-     </Link>
-   </ItemDefinitionGroup>
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-@@ -166,26 +166,26 @@
-       <TargetEnvironment>X64</TargetEnvironment>
-     </Midl>
-     <ClCompile>
--      <AdditionalIncludeDirectories>$(opensslDir)\inc64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>$(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-     </ClCompile>
-     <PreLinkEvent>
-       <Command>
-       </Command>
-     </PreLinkEvent>
-     <Link>
--      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out64\libeay32.lib;$(opensslDir)\out64\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>ws2_32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-     </Link>
-   </ItemDefinitionGroup>
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-     <ClCompile>
--      <AdditionalIncludeDirectories>$(opensslDir)\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>$(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-     </ClCompile>
-     <PreLinkEvent>
-       <Command>
-       </Command>
-     </PreLinkEvent>
-     <Link>
--      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32\libeay32.lib;$(opensslDir)\out32\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>ws2_32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-     </Link>
-   </ItemDefinitionGroup>
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-@@ -193,26 +193,26 @@
-       <TargetEnvironment>X64</TargetEnvironment>
-     </Midl>
-     <ClCompile>
--      <AdditionalIncludeDirectories>$(opensslDir)\inc64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>$(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-     </ClCompile>
-     <PreLinkEvent>
-       <Command>
-       </Command>
-     </PreLinkEvent>
-     <Link>
--      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out64\libeay32.lib;$(opensslDir)\out64\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>ws2_32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-     </Link>
-   </ItemDefinitionGroup>
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
-     <ClCompile>
--      <AdditionalIncludeDirectories>$(opensslDir)\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>$(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-     </ClCompile>
-     <PreLinkEvent>
-       <Command>
-       </Command>
-     </PreLinkEvent>
-     <Link>
--      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32\libeay32.lib;$(opensslDir)\out32\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>ws2_32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-     </Link>
-   </ItemDefinitionGroup>
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">
-@@ -220,27 +220,27 @@
-       <TargetEnvironment>X64</TargetEnvironment>
-     </Midl>
-     <ClCompile>
--      <AdditionalIncludeDirectories>$(opensslDir)\inc64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>$(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-     </ClCompile>
-     <PreLinkEvent>
-       <Command>
-       </Command>
-     </PreLinkEvent>
-     <Link>
--      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out64\libeay32.lib;$(opensslDir)\out64\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>ws2_32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-       <TargetMachine>MachineX64</TargetMachine>
-     </Link>
-   </ItemDefinitionGroup>
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
-     <ClCompile>
--      <AdditionalIncludeDirectories>$(opensslDir)\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>$(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-     </ClCompile>
-     <PreLinkEvent>
-       <Command>
-       </Command>
-     </PreLinkEvent>
-     <Link>
--      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out32\libeay32.lib;$(opensslDir)\out32\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>ws2_32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-     </Link>
-   </ItemDefinitionGroup>
-   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">
-@@ -248,14 +248,14 @@
-       <TargetEnvironment>X64</TargetEnvironment>
-     </Midl>
+   <ItemDefinitionGroup>
      <ClCompile>
--      <AdditionalIncludeDirectories>$(opensslDir)\inc64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+-      <AdditionalIncludeDirectories>$(opensslDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 +      <AdditionalIncludeDirectories>$(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      </ClCompile>
-     <PreLinkEvent>
-       <Command>
-       </Command>
-     </PreLinkEvent>
      <Link>
--      <AdditionalDependencies>ws2_32.lib;$(opensslDir)\out64\libeay32.lib;$(opensslDir)\out64\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-+      <AdditionalDependencies>ws2_32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-       <TargetMachine>MachineX64</TargetMachine>
+-      <AdditionalDependencies>ws2_32.lib;crypt32.lib;$(OutDir)libeay$(PyDebugExt).lib;$(OutDir)ssleay$(PyDebugExt).lib;%(AdditionalDependencies)</AdditionalDependencies>
++      <AdditionalDependencies>ws2_32.lib;crypt32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      </Link>
    </ItemDefinitionGroup>
-@@ -271,10 +271,6 @@
+   <ItemGroup>
+@@ -75,14 +75,6 @@
        <Project>{cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}</Project>
        <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
      </ProjectReference>
--    <ProjectReference Include="ssl.vcxproj">
+-    <ProjectReference Include="libeay.vcxproj">
 -      <Project>{e5b04cc0-eb4c-42ab-b4dc-18ef95f864b0}</Project>
 -      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 -    </ProjectReference>
+-    <ProjectReference Include="ssleay.vcxproj">
+-      <Project>{10615b24-73bf-4efa-93aa-236916321317}</Project>
+-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+-    </ProjectReference>
      <ProjectReference Include="_socket.vcxproj">
        <Project>{86937f53-c189-40ef-8ce8-8759d8e7d480}</Project>
        <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-diff -ru python3.old_/setup.py python3/setup.py
---- python3.old_/setup.py	2012-09-29 10:00:50.000000000 +0200
-+++ python3/setup.py	2012-11-13 14:18:23.484158149 +0100
-@@ -757,7 +757,10 @@
+diff -ru python3.orig/setup.py python3/setup.py
+--- python3.orig/setup.py       2015-08-22 18:16:15.825267200 +0200
++++ python3/setup.py    2015-08-22 18:22:44.162757900 +0200
+@@ -778,7 +778,10 @@
          exts.append( Extension('_socket', ['socketmodule.c'],
                                 depends = ['socketmodule.h']) )
          # Detect SSL support for the socket module (via _ssl)
@@ -192,7 +61,7 @@ diff -ru python3.old_/setup.py python3/setup.py
                                '/usr/local/ssl/include',
                                '/usr/contrib/ssl/include/'
                               ]
-@@ -769,8 +774,12 @@
+@@ -790,8 +793,12 @@
                                 ['/usr/kerberos/include'])
              if krb5_h:
                  ssl_incs += krb5_h
@@ -205,4 +74,5 @@ diff -ru python3.old_/setup.py python3/setup.py
 +                                      '/usr/local/ssl/lib',
                                        '/usr/contrib/ssl/lib/'
                                       ] )
- 
+
+
diff --git a/external/python3/python-3.3.3-aix.patch.1 b/external/python3/python-3.3.3-aix.patch.1
index f510a81da840..1387e9c8852e 100644
--- a/external/python3/python-3.3.3-aix.patch.1
+++ b/external/python3/python-3.3.3-aix.patch.1
@@ -1,8 +1,9 @@
 build with GCC on AIX
 
---- Python-3.3.3/configure	2012-11-28 09:05:45.990529603 +0000
-+++ Python-3.3.3/configure	2012-11-28 09:06:23.037963934 +0000
-@@ -3426,8 +3426,6 @@
+diff -ru python3.orig/configure python3/configure
+--- python3.orig/configure	2015-07-26 17:10:18.218393484 +0200
++++ python3/configure	2015-07-26 17:29:44.460471779 +0200
+@@ -3534,8 +3534,6 @@
  else
  
  	case $ac_sys_system in
@@ -11,7 +12,7 @@ build with GCC on AIX
  	*)	without_gcc=no;;
  	esac
  fi
-@@ -5541,10 +5539,18 @@
+@@ -5787,10 +5785,18 @@
  	      PY3LIBRARY=libpython3.so
  	  fi
            ;;
@@ -19,7 +20,7 @@ build with GCC on AIX
 +    Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*|AIX*)
  	  LDLIBRARY='libpython$(LDVERSION).so'
 -	  BLDLIBRARY='-L. -lpython$(LDVERSION)'
--	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
+-	  RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
 +	  case $ac_sys_system in
 +	    AIX*)
 +	      BLDLIBRARY='-Wl,-brtl -L. -lpython$(LDVERSION)'
@@ -33,7 +34,7 @@ build with GCC on AIX
  	  INSTSONAME="$LDLIBRARY".$SOVERSION
  	  if test "$with_pydebug" != yes
            then
-@@ -8301,8 +8307,13 @@
+@@ -8789,8 +8795,13 @@
  then
  	case $ac_sys_system/$ac_sys_release in
  	AIX*)
@@ -49,9 +50,10 @@ build with GCC on AIX
  		;;
  	IRIX/5*) LDSHARED="ld -shared";;
  	IRIX*/6*) LDSHARED="ld ${SGI_ABI} -shared -all";;
---- Python-3.3.3/configure.ac	2012-11-28 09:05:45.990529603 +0000
-+++ Python-3.3.3/configure.ac	2012-11-28 09:06:23.038963946 +0000
-@@ -545,8 +545,6 @@
+diff -ru python3.orig/configure.ac python3/configure.ac
+--- python3.orig/configure.ac	2015-07-05 18:50:08.000000000 +0200
++++ python3/configure.ac	2015-07-26 17:32:10.445481579 +0200
+@@ -587,8 +587,6 @@
  		without_gcc=$withval;;
  	esac], [
  	case $ac_sys_system in
@@ -60,15 +62,15 @@ build with GCC on AIX
  	*)	without_gcc=no;;
  	esac])
  AC_MSG_RESULT($without_gcc)
-@@ -910,10 +908,18 @@
+@@ -1090,10 +1088,18 @@
  	      PY3LIBRARY=libpython3.so
  	  fi
            ;;
 -    Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*)
-+    Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*|AIX*)
++    Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*|AIX*)Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*)
  	  LDLIBRARY='libpython$(LDVERSION).so'
 -	  BLDLIBRARY='-L. -lpython$(LDVERSION)'
--	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
+-	  RUNSHARED=LD_LIBRARY_PATH=`pwd`${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
 +	  case $ac_sys_system in
 +	    AIX*)
 +	      BLDLIBRARY='-Wl,-brtl -L. -lpython$(LDVERSION)'
@@ -79,10 +81,10 @@ build with GCC on AIX
 +	      RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
 +	      ;;
 +	  esac
- 	  case $ac_sys_system in
- 	      FreeBSD*)
- 		SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
-@@ -1866,8 +1872,13 @@
+ 	  INSTSONAME="$LDLIBRARY".$SOVERSION
+ 	  if test "$with_pydebug" != yes
+           then
+@@ -2164,8 +2170,13 @@
  then
  	case $ac_sys_system/$ac_sys_release in
  	AIX*)
@@ -98,9 +100,10 @@ build with GCC on AIX
  		;;
  	IRIX/5*) LDSHARED="ld -shared";;
  	IRIX*/6*) LDSHARED="ld ${SGI_ABI} -shared -all";;
---- Python-3.3.3/Makefile.pre.in	2012-11-28 09:05:45.861528086 +0000
-+++ Python-3.3.3/Makefile.pre.in	2012-11-28 09:06:23.046964040 +0000
-@@ -493,14 +493,20 @@
+diff -ru python3.orig/Makefile.pre.in python3/Makefile.pre.in
+--- python3.orig/Makefile.pre.in	2015-07-05 18:50:07.000000000 +0200
++++ python3/Makefile.pre.in	2015-07-26 17:34:00.386488960 +0200
+@@ -598,14 +598,20 @@
  
  libpython$(LDVERSION).so: $(LIBRARY_OBJS)
  	if test $(INSTSONAME) != $(LDLIBRARY); then \
@@ -123,7 +126,7 @@ build with GCC on AIX
  
  libpython$(LDVERSION).dylib: $(LIBRARY_OBJS)
  	 $(CC) -dynamiclib -Wl,-single_module $(PY_LDFLAGS) -undefined dynamic_lookup -Wl,-install_name,$(prefix)/lib/libpython$(LDVERSION).dylib -Wl,-compatibility_version,$(VERSION) -Wl,-current_version,$(VERSION) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
-@@ -1106,6 +1112,8 @@
+@@ -1299,6 +1305,8 @@
  	export PATH; PATH="`pwd`:$$PATH"; \
  	export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \
  	export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH="`pwd`"; \
@@ -132,9 +135,10 @@ build with GCC on AIX
  	export EXE; EXE="$(BUILDEXE)"; \
  	if [ -n "$(MULTIARCH)" ]; then export MULTIARCH; MULTIARCH=$(MULTIARCH); fi; \
  	export PYTHON_FOR_BUILD; \
---- Python-3.3.3/Modules/Setup.dist	2012-11-28 09:05:45.935528957 +0000
-+++ Python-3.3.3/Modules/Setup.dist	2012-11-28 09:06:23.052964111 +0000
-@@ -177,7 +177,7 @@
+diff -ru python3.orig/Modules/Setup.dist python3/Modules/Setup.dist
+--- python3.orig/Modules/Setup.dist	2015-07-05 18:50:07.000000000 +0200
++++ python3/Modules/Setup.dist	2015-07-26 17:34:27.951490811 +0200
+@@ -181,7 +181,7 @@
  #_bisect _bisectmodule.c	# Bisection algorithms
  #_heapq _heapqmodule.c	# Heap queue algorithm
  
diff --git a/external/python3/python-3.3.3-elf-rpath.patch.1 b/external/python3/python-3.3.3-elf-rpath.patch.1
index 33de913e09f4..945f7a52c690 100644
--- a/external/python3/python-3.3.3-elf-rpath.patch.1
+++ b/external/python3/python-3.3.3-elf-rpath.patch.1
@@ -1,13 +1,14 @@
 set RPATH (only to be used on ELF platforms)
 
---- python3/Makefile.pre.in	2013-04-19 15:08:43.637715422 +0200
-+++ python3/Makefile.pre.in	2013-04-19 15:07:32.685711138 +0200
-@@ -464,7 +464,7 @@
+diff -ru python3.orig/Makefile.pre.in python3/Makefile.pre.in
+--- python3.orig/Makefile.pre.in	2015-07-26 20:29:07.126194320 +0200
++++ python3/Makefile.pre.in	2015-07-26 20:37:21.814227530 +0200
+@@ -550,7 +550,7 @@
  
  # Build the interpreter
- $(BUILDPYTHON):	Modules/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
--	$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
-+	$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) -Wl,-rpath,\$$ORIGIN
+ $(BUILDPYTHON):	Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
+-	$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
++	$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) -Wl,-rpath,\$$ORIGIN
  
  platform: $(BUILDPYTHON) pybuilddir.txt
  	$(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print(get_platform()+"-"+sys.version[0:3])' >platform
diff --git a/external/python3/python-3.3.3-py17797.patch.1 b/external/python3/python-3.3.3-py17797.patch.1
index 8fcb703f1935..0365717d1070 100644
--- a/external/python3/python-3.3.3-py17797.patch.1
+++ b/external/python3/python-3.3.3-py17797.patch.1
@@ -1,27 +1,29 @@
 http://bugs.python.org/issue17797
 http://connect.microsoft.com/VisualStudio/feedback/details/785119/
 
-Visual Studio 2012 changed return value for fileno function that breaks
+Visual Studio 2013 changed return value for fileno function that breaks
 when python tries to check/setup stdin/out/err
 GetStdHandle on Windows XP behaves contrary to the documentation...
+MSVC 14.0 fixed this bug.
 
-diff --git a/Python/pythonrun.c b/Python/pythonrun.c
-index 91d56b7..d28ffc7 100644
---- a/Python/pythonrun.c
-+++ b/Python/pythonrun.c
-@@ -1015,13 +1015,28 @@ error:
+diff -ru python3.orig/Python/pylifecycle.c python3/Python/pylifecycle.c
+--- python3.orig/Python/pylifecycle.c	2015-07-05 18:50:08.000000000 +0200
++++ python3/Python/pylifecycle.c	2015-07-26 20:01:23.563082638 +0200
+@@ -1065,15 +1065,30 @@
  static int
  is_valid_fd(int fd)
  {
 -    int dummy_fd;
      if (fd < 0 || !_PyVerify_fd(fd))
          return 0;
+-    _Py_BEGIN_SUPPRESS_IPH
 -    dummy_fd = dup(fd);
--    if (dummy_fd < 0)
--        return 0;
--    close(dummy_fd);
+-    if (dummy_fd >= 0)
+-        close(dummy_fd);
+-    _Py_END_SUPPRESS_IPH
+-    return dummy_fd >= 0;
 +
-+#if defined(MS_WINDOWS) && defined(HAVE_FSTAT)
++#if defined(MS_WINDOWS) && defined(HAVE_FSTAT) && defined(_MSC_VER) && (_MSC_VER >= 1700 && _MSC_VER < 1900)
 +    /* dup (DuplicateHandle) doesn't say fd is a valid *file* handle.
 +     * It could be a current thread pseudo-handle.
 +     */
@@ -29,17 +31,19 @@ index 91d56b7..d28ffc7 100644
 +        struct stat buf;
 +        if (fstat(fd, &buf) < 0 && (errno == EBADF || errno == ENOENT))
 +            return 0;
++        else
++	    return 1;
 +    }
 +#else
 +    {
-+        int dummy_fd;
-+        dummy_fd = dup(fd);
-+        if (dummy_fd < 0)
-+            return 0;
-+        close(dummy_fd);
++        int dummy_fd = dup(fd);
++        _Py_BEGIN_SUPPRESS_IPH
++        if (dummy_fd >= 0)
++            close(dummy_fd);
++        _Py_END_SUPPRESS_IPH
++        return dummy_fd >= 0;
 +    }
 +#endif
-+
-     return 1;
  }
  
+ /* Initialize sys.stdin, stdout, stderr and builtins.open */
diff --git a/external/python3/python-3.5.0-tcltk.disable.patch b/external/python3/python-3.5.0-tcltk.disable.patch
new file mode 100755
index 000000000000..3aeebec2719c
--- /dev/null
+++ b/external/python3/python-3.5.0-tcltk.disable.patch
@@ -0,0 +1,16 @@
+diff -ru python3.orig/PCbuild/pcbuild.sln python3/PCbuild/pcbuild.sln
+--- foo/python3.orig/PCbuild/pcbuild.sln	2015-08-22 19:12:48.508338400 +0200
++++ foo/python3/PCbuild/pcbuild.sln	2015-08-22 19:15:50.130169800 +0200
+@@ -58,12 +58,6 @@
+ EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testmultiphase", "_testmultiphase.vcxproj", "{16BFE6F0-22EF-40B5-B831-7E937119EF10}"
+ EndProject
+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tcl", "tcl.vcxproj", "{B5FD6F1D-129E-4BFF-9340-03606FAC7283}"
+-EndProject
+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tix", "tix.vcxproj", "{C5A3E7FB-9695-4B2E-960B-1D9F43F1E555}"
+-EndProject
+-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tk", "tk.vcxproj", "{7E85ECCF-A72C-4DA4-9E52-884508E80BA1}"
+-EndProject
+ Global
+ 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ 		Debug|Win32 = Debug|Win32
diff --git a/external/python3/python-3.5.tweak.strip.soabi.patch b/external/python3/python-3.5.tweak.strip.soabi.patch
new file mode 100644
index 000000000000..48ac7f82f8be
--- /dev/null
+++ b/external/python3/python-3.5.tweak.strip.soabi.patch
@@ -0,0 +1,12 @@
+diff -ru python3.orig/configure python3/configure
+--- misc/python3.orig/configure	2015-07-26 21:14:31.127377193 +0200
++++ misc/python3/configure	2015-07-26 21:21:34.975405648 +0200
+@@ -14388,7 +14388,7 @@
+ $as_echo "$ABIFLAGS" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking SOABI" >&5
+ $as_echo_n "checking SOABI... " >&6; }
+-SOABI='cpython-'`echo $VERSION | tr -d .`${ABIFLAGS}${PLATFORM_TRIPLET:+-$PLATFORM_TRIPLET}
++SOABI='cpython-'`echo $VERSION$ABIFLAGS`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SOABI" >&5
+ $as_echo "$SOABI" >&6; }
+ 
diff --git a/external/python3/ubsan.patch.0 b/external/python3/ubsan.patch.0
index e3798174baa0..700f43b9b2f8 100644
--- a/external/python3/ubsan.patch.0
+++ b/external/python3/ubsan.patch.0
@@ -1,6 +1,7 @@
---- Modules/_ctypes/libffi/src/x86/ffi64.c
-+++ Modules/_ctypes/libffi/src/x86/ffi64.c
-@@ -545,11 +545,15 @@
+diff -ru python3.orig/Modules/_ctypes/libffi/src/x86/ffi64.c python3/Modules/_ctypes/libffi/src/x86/ffi64.c
+--- Modules/_ctypes/libffi/src/x86/ffi64.c	2015-07-05 18:50:07.000000000 +0200
++++ Modules/_ctypes/libffi/src/x86/ffi64.c	2015-07-26 20:18:56.457153323 +0200
+@@ -548,11 +548,15 @@
    tramp = (volatile unsigned short *) &closure->tramp[0];
  
    tramp[0] = 0xbb49;		/* mov <code>, %r11	*/
@@ -20,19 +21,9 @@
  
    /* Set the carry bit iff the function uses any sse registers.
       This is clc or stc, together with the first byte of the jmp.  */
---- Objects/bytearrayobject.c
-+++ Objects/bytearrayobject.c
-@@ -294,7 +294,7 @@
-         PyBuffer_Release(&vo);
-         return NULL;
-     }
--    memcpy(self->ob_bytes + mysize, vo.buf, vo.len);
-+    if (vo.len != 0) memcpy(self->ob_bytes + mysize, vo.buf, vo.len);
-     PyBuffer_Release(&vo);
-     Py_INCREF(self);
-     return (PyObject *)self;
---- Objects/listobject.c
-+++ Objects/listobject.c
+diff -ru python3.orig/Objects/listobject.c python3/Objects/listobject.c
+--- Objects/listobject.c	2015-07-05 18:50:08.000000000 +0200
++++ Objects/listobject.c	2015-07-26 20:22:30.539167695 +0200
 @@ -641,7 +641,7 @@
              goto Error;
          }
@@ -41,32 +32,12 @@
 +    if (s != 0) memcpy(recycle, &item[ilow], s);
  
      if (d < 0) { /* Delete -d items */
-         memmove(&item[ihigh+d], &item[ihigh],
-@@ -2036,7 +2036,7 @@
-     if (keys != NULL) {
-         for (i = 0; i < saved_ob_size; i++)
-             Py_DECREF(keys[i]);
--        if (keys != &ms.temparray[saved_ob_size+1])
-+        if (keys != ((char *) ms.temparray) + (saved_ob_size+1) * sizeof (PyObject *))
-             PyMem_FREE(keys);
-     }
- 
---- Objects/longobject.c
-+++ Objects/longobject.c
-@@ -36,7 +36,7 @@
- static PyObject *
- get_small_int(sdigit ival)
- {
--    PyObject *v = (PyObject*)(small_ints + ival + NSMALLNEGINTS);
-+    PyObject *v = (PyObject*)(small_ints + (ival + NSMALLNEGINTS));
-     Py_INCREF(v);
- #ifdef COUNT_ALLOCS
-     if (ival >= 0)
+         Py_ssize_t tail;
 --- Modules/_ctypes/_ctypes.c
 +++ Modules/_ctypes/_ctypes.c
-@@ -1328,8 +1328,10 @@
-     if (stgdict->shape == NULL)
+@@ -1358,8 +1358,10 @@
          goto error;
+     }
      stgdict->shape[0] = length;
 -    memmove(&stgdict->shape[1], itemdict->shape,
 -        sizeof(Py_ssize_t) * (stgdict->ndim - 1));