Merge IEC60870 branch.
py2compat
6 weeks ago, Tomaz Orac