test against 2.0
Merge branch 'master' into smart_text