Fix as string behavior on py2
Merge branch 'fix-py2-asstring' into dev