Merge branch 'hotfix/0.7.2'
Use new-style classes
Merge branch 'ravishi-master' into develop