checkout add to try block for python2.6
Merge branch 'master' into python3.3_support