Merge "Use Python 3.x compatible syntax constructs"