Merge
py2compat
15 months ago, Tomaz Orac