Fixes for python 2.6 compatibility
Merge branch 'master' into sandbox