Issue #6057: Merge from 3.5

author Berker Peksag <berker.peksag@gmail.com>

Wed, 24 Aug 2016 21:45:36 +0000 (00:45 +0300)

committer Berker Peksag <berker.peksag@gmail.com>

Wed, 24 Aug 2016 21:45:36 +0000 (00:45 +0300)
author Berker Peksag <berker.peksag@gmail.com>
Wed, 24 Aug 2016 21:45:36 +0000 (00:45 +0300)
committer Berker Peksag <berker.peksag@gmail.com>
Wed, 24 Aug 2016 21:45:36 +0000 (00:45 +0300)
diff --cc Doc/library/sqlite3.rst
Simple merge
diff --cc Misc/ACKS
Simple merge
author	Berker Peksag <berker.peksag@gmail.com>
	Wed, 24 Aug 2016 21:45:36 +0000 (00:45 +0300)
committer	Berker Peksag <berker.peksag@gmail.com>
	Wed, 24 Aug 2016 21:45:36 +0000 (00:45 +0300)
		1	2
Doc/library/sqlite3.rst	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history