1_38_0 support
Merge branch 'master' into 1.0