Merge "Python 3 Fix: dict().iteritems no longer exists"