py2/3 changes
Merge branch 'sandbox1' of github.com:curiousguy13/sugar-build into sandbox1