py2-3 compatibility
Merge remote-tracking branch 'foss/nootan-dev' into dev