including testing
Merge branch 'master' into v1.1