Merge branch 'unstable'
Merge branch 'unstable'
fix for python2.6
Merge branch 'hotfix-python26'