fixes for travis-ci
Merge branch 'master' into modern-actions