API changes 3.8.0->3.8.1
Merge branch 'master' into bugfix/3.8.x
Release 3.8.1