Null merge 3.5

Changes were backported (transplated) from default to 3.5.
This commit is contained in:
Victor Stinner 2016-03-25 10:03:49 +01:00
commit 734f28461e

Diff content is not available