v2.0.0.pre.4
Merge branch 'master' into smart_text