Python 2/3 fix for forms export.
Merge