v2.0.0.pre.7
Merge branch 'master' into smart-text