Merge.
py2compat
16 months ago, Tomaz Orac