Merge 3.4 (I commited a patch to the wrong branch and then used hg backout)

This commit is contained in:
Victor Stinner 2014-05-14 17:13:02 +02:00
commit f7667e3989

Diff Content Not Available