Update for Python 2.7
Merge branch 'python2' into develop