fix assertIs for python 2.6
Merge branch 'hotfix/assertIs'
Merge tag 'assertIs' into develop

Fix assertIs for python 2.6