merge with upstream/frappe

frappe/twofactor.py

@@ -12,7 +12,7 @@ from pyqrcode import create as qrcreate
 from six import StringIO
 from base64 import b64encode, b32encode
 from frappe.utils import get_url, get_datetime, time_diff_in_seconds
-from six import string_types
+from six import iteritems, string_types
 
 class ExpiredLoginException(Exception): pass